Merge branch 'master' into haroon_dev

lib/core/api_consts.dart

@@ -318,11 +318,18 @@ class ApiConsts {
   // ************     static values for Api   ****************
   static final double appVersionID = 22.4;
 
+
   // static final double appVersionID = 50.7;
   static final int appChannelId = 3;
   static final String appIpAddress = "10.20.10.20";
   static final String appGeneralId = "Cs2020@2016\$2958";
   static final String sessionID = 'TMRhVmkGhOsvamErw';
+
+  // Notification Center GUIDs - Configure these values as per your notification center setup
+  static final String notificationCenterAppGUID = "SzFwWjI0TjhmSjZreDVsNmc3SDRSdWlxUG1h";
+  static final String notificationServiceGUID_Login = "D8BD5C76-4B50-4122-81D0-C3AA25DB08A2";
+  static final String notificationServiceGUID_Registration = "690D3595-A1E1-489A-B9AB-6270E83AD6ED";
+  static final String notificationServiceGUID_FamilyFile = "318285E4-6221-4A66-8FAF-2265D2B4B24C";
 }
 
 // PACKAGES and OFFERS

lib/core/utils/request_utils.dart

@@ -75,6 +75,12 @@ class RequestUtils {
       }
       request.isRegister = false;
     }
+
+    request.notificationCenterAppGUID = ApiConsts.notificationCenterAppGUID;
+    request.notificationCenterAppServiceGUID = isForRegister
+        ? ApiConsts.notificationServiceGUID_Registration
+        : ApiConsts.notificationServiceGUID_Login;
+
     return request;
   }
 
@@ -148,6 +154,12 @@ class RequestUtils {
     }
 
     request.deviceTypeID = request.searchType;
+
+    request.notificationCenterAppGUID = ApiConsts.notificationCenterAppGUID;
+    request.notificationCenterAppServiceGUID = (registeredData != null && registeredData.isRegister == true)
+        ? ApiConsts.notificationServiceGUID_Registration
+        : ApiConsts.notificationServiceGUID_Login;
+
     return request;
   }
 
@@ -220,6 +232,13 @@ class RequestUtils {
       request.familyRegionID = zipCode == CountryEnum.saudiArabia.countryCode ? 1 : 2;
     }
 
+    request.notificationCenterAppGUID = ApiConsts.notificationCenterAppGUID;
+    request.notificationCenterAppServiceGUID = isFormFamilyFile
+        ? ApiConsts.notificationServiceGUID_FamilyFile
+        : isForRegister
+            ? ApiConsts.notificationServiceGUID_Registration
+            : ApiConsts.notificationServiceGUID_Login;
+
     return request;
   }
 

lib/features/authentication/authentication_repo.dart

@@ -222,6 +222,8 @@ class AuthenticationRepoImp implements AuthenticationRepo {
     if (isRegister) {
       newRequest["activationCode"] = activationCode ?? "0000";
       newRequest["isSilentLogin"] = activationCode == null;
+      newRequest.remove("NotificationCenterAppGUID");
+      newRequest.remove("NotificationCenterAppSeviceGUID");
     } else {
       newRequest.activationCode = activationCode ?? "0000";
       newRequest.isSilentLogin = activationCode == null;

lib/features/authentication/authentication_view_model.dart

@@ -1518,7 +1518,9 @@ class AuthenticationViewModel extends ChangeNotifier {
         LoaderBottomSheet.hideLoader();
         if (apiResponse.data["MessageStatus"] == 1) {
           LoaderBottomSheet.showLoader(loadingText: "Your medical file has been created successfully. \nPlease proceed to login.");
-          //TODO: Here We Need to Show a Dialog Of Something in the case of Success.
+          // Reset registration payload and clear healthId so subsequent logins hit the login endpoint
+          _appState.getUserRegistrationPayload.healthId = null;
+          _appState.setUserRegistrationPayload = RegistrationDataModelPayload();
           await clearDefaultInputValues(); // This will Clear All Default Values Of User.
           Future.delayed(Duration(seconds: 1), () {
             LoaderBottomSheet.hideLoader();

lib/features/authentication/models/request_models/send_activation_request_model.dart

@@ -31,6 +31,8 @@ class SendActivationRequest {
   int? familyRegionID;
   bool? isPatientExcluded;
   String? turnstileToken;
+  String? notificationCenterAppGUID;
+  String? notificationCenterAppServiceGUID;
 
   SendActivationRequest(
       {this.patientMobileNumber,
@@ -64,7 +66,10 @@ class SendActivationRequest {
       this.status,
       this.familyRegionID,
       this.isPatientExcluded,
-      this.turnstileToken});
+      this.turnstileToken,
+      this.notificationCenterAppGUID,
+      this.notificationCenterAppServiceGUID
+});
 
   SendActivationRequest.fromJson(Map<String, dynamic> json) {
     patientMobileNumber = json['PatientMobileNumber'];
@@ -99,6 +104,8 @@ class SendActivationRequest {
     familyRegionID = json['FamilyRegionID'];
     isPatientExcluded = json['IsPatientExcluded'];
     turnstileToken = json['TurnstileToken'];
+    notificationCenterAppGUID = json['NotificationCenterAppGUID'];
+    notificationCenterAppServiceGUID = json['NotificationCenterAppSeviceGUID'];
   }
 
   Map<String, dynamic> toJson() {
@@ -141,6 +148,8 @@ class SendActivationRequest {
     if (turnstileToken != null) {
       data['TurnstileToken'] = turnstileToken;
     }
+    data['NotificationCenterAppGUID'] = notificationCenterAppGUID;
+    data['NotificationCenterAppSeviceGUID'] = notificationCenterAppServiceGUID;
     return data;
   }
 }

lib/presentation/my_family/widget/family_cards.dart

@@ -475,7 +475,7 @@ class _FamilyCardsState extends State<FamilyCards> {
                               ? Wrap(direction: Axis.horizontal, spacing: 4.h, runSpacing: 4.h, children: [
                                   AppCustomChipWidget(
                                     icon: AppAssets.file_icon,
-                                    richText: "${LocaleKeys.fileno.tr(context: context)}: ${profile.responseId}".toText10(isBold: true),
+                                    richText: "${profile.responseId}".toText10(isBold: true),
                                     labelPadding: EdgeInsetsDirectional.only(start: -4.w, end: 6.w),
                                   ),
                                   AppCustomChipWidget(
@@ -489,7 +489,7 @@ class _FamilyCardsState extends State<FamilyCards> {
                               : SizedBox(
                                   height: 4.h,
                                 ),
-                          Spacer(),
+                          SizedBox(height: 8.h),
                           widget.isForWalletRecharge
                               ? CustomButton(
                                   height: 40.h,