diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart
index 5b6c873..3b3ed28 100644
--- a/lib/core/api_consts.dart
+++ b/lib/core/api_consts.dart
@@ -766,6 +766,7 @@ class ApiConsts {
         SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx';
         break;
       case AppEnvironmentTypeEnum.preProd:
+        
         baseUrl = "https://webservices.hmg.com/";
         payFortEnvironment = FortEnvironment.production;
         applePayMerchantId = "merchant.com.hmgwebservices";
diff --git a/lib/core/app_state.dart b/lib/core/app_state.dart
index e5537c6..4408844 100644
--- a/lib/core/app_state.dart
+++ b/lib/core/app_state.dart
@@ -7,6 +7,8 @@ import 'package:hmg_patient_app_new/features/authentication/models/resp_models/c
 import 'package:hmg_patient_app_new/features/authentication/models/resp_models/select_device_by_imei.dart';
 import 'package:hmg_patient_app_new/services/navigation_service.dart';
 
+import '../features/authentication/models/request_models/registration_payload_model.dart';
+
 class AppState {
   NavigationService navigationService;
 
@@ -103,4 +105,13 @@ class AppState {
   set setNHICUserData(CheckUserStatusResponseNHIC value) {
     _nHICUserData = value;
   }
+
+
+  RegistrationDataModelPayload? _userRegistrationPayload;
+
+  RegistrationDataModelPayload get getUserRegistrationPayload => _userRegistrationPayload!;
+
+  set setUserRegistrationPayload(RegistrationDataModelPayload value) {
+    _userRegistrationPayload = value;
+  }
 }
diff --git a/lib/core/utils/push_notification_handler.dart b/lib/core/utils/push_notification_handler.dart
index 1d2141e..4568a15 100644
--- a/lib/core/utils/push_notification_handler.dart
+++ b/lib/core/utils/push_notification_handler.dart
@@ -351,6 +351,7 @@ class PushNotificationHandler {
   }
 
   onToken(String token) async {
+
     print("Push Notification Token: " + token);
     await Utils.saveStringFromPrefs(CacheConst.pushToken, token);
   }
diff --git a/lib/features/authentication/authentication_repo.dart b/lib/features/authentication/authentication_repo.dart
index 21061dc..7a4d1c1 100644
--- a/lib/features/authentication/authentication_repo.dart
+++ b/lib/features/authentication/authentication_repo.dart
@@ -52,7 +52,13 @@ class AuthenticationRepoImp implements AuthenticationRepo {
           try {
             final list = response['Patient_SELECTDeviceIMEIbyIMEIList'];
             if (list == null || list.isEmpty) {
-              throw Exception("Device list is empty");
+              apiResponse = GenericApiModel<SelectDeviceByImeiRespModelElement>(
+                messageStatus: messageStatus,
+                statusCode: statusCode,
+                errorMessage: errorMessage,
+                data: null,
+              );
+              return;
             }
 
             final model = SelectDeviceByImeiRespModelElement.fromJson(list[0] as Map<String, dynamic>);
@@ -160,12 +166,17 @@ class AuthenticationRepoImp implements AuthenticationRepo {
     required String? activationCode,
     required bool isRegister,
   }) async {
-    newRequest.activationCode = activationCode ?? "0000";
-    newRequest.isSilentLogin = activationCode != null ? false : true;
-    newRequest.projectOutSA = newRequest.zipCode == '966' ? false : true;
-    newRequest.isDentalAllowedBackend = false;
-    newRequest.forRegisteration = newRequest.isRegister ?? false;
-    newRequest.isRegister = false;
+    if (isRegister) {
+      newRequest["activationCode"] = activationCode ?? "0000";
+      newRequest["isSilentLogin"] = activationCode != null ? false : true;
+    } else {
+      newRequest.activationCode = activationCode ?? "0000";
+      newRequest.isSilentLogin = activationCode != null ? false : true;
+      newRequest.projectOutSA = newRequest.zipCode == '966' ? false : true;
+      newRequest.isDentalAllowedBackend = false;
+      newRequest.forRegisteration = newRequest.isRegister ?? false;
+      newRequest.isRegister = false;
+    }
 
     final endpoint = isRegister ? ApiConsts.checkActivationCodeRegister : ApiConsts.checkActivationCode;
 
@@ -175,7 +186,7 @@ class AuthenticationRepoImp implements AuthenticationRepo {
 
       await apiClient.post(
         endpoint,
-        body: newRequest.toJson(),
+        body: isRegister ? newRequest : newRequest.toJson(),
         onFailure: (error, statusCode, {messageStatus, failureType}) {
           failure = failureType;
         },
diff --git a/lib/features/authentication/authentication_view_model.dart b/lib/features/authentication/authentication_view_model.dart
index 6a2ea74..e3c8520 100644
--- a/lib/features/authentication/authentication_view_model.dart
+++ b/lib/features/authentication/authentication_view_model.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'dart:developer';
-
+import 'package:flutter/services.dart' show rootBundle;
 import 'package:flutter/material.dart';
 import 'package:hijri_gregorian_calendar/hijri_gregorian_calendar.dart';
 import 'package:hmg_patient_app_new/core/app_state.dart';
@@ -14,6 +14,7 @@ import 'package:hmg_patient_app_new/core/utils/validation_utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/features/authentication/authentication_repo.dart';
 import 'package:hmg_patient_app_new/features/authentication/models/request_models/check_activation_code_register_request_model.dart';
+import 'package:hmg_patient_app_new/features/authentication/models/request_models/registration_payload_model.dart';
 import 'package:hmg_patient_app_new/features/authentication/models/resp_models/check_activation_code_resp_model.dart';
 import 'package:hmg_patient_app_new/features/authentication/models/resp_models/check_user_staus_nhic_response_model.dart';
 import 'package:hmg_patient_app_new/features/authentication/models/resp_models/select_device_by_imei.dart';
@@ -49,7 +50,7 @@ class AuthenticationViewModel extends ChangeNotifier {
         _authenticationRepo = authenticationRepo,
         _localAuthService = localAuthService;
 
-  final TextEditingController nationalIdController = TextEditingController(), phoneNumberController = TextEditingController(), dobController = TextEditingController();
+  final TextEditingController nationalIdController = TextEditingController(), phoneNumberController = TextEditingController(), dobController = TextEditingController(), nameController = TextEditingController();
   CountryEnum selectedCountrySignup = CountryEnum.saudiArabia;
   MaritalStatusTypeEnum? maritalStatus;
   GenderTypeEnum? genderType;
@@ -62,23 +63,8 @@ class AuthenticationViewModel extends ChangeNotifier {
 
   //==================
 
-  bool isDubai = false;
-  bool authenticated = false;
-  late int mobileNumber;
   String errorMsg = '';
-  var registerd_data;
-  bool isMoreOption = false;
-  var zipCode;
-  var patientOutSA;
-  var loginTokenID;
-  var loginType;
-  var deviceToken;
-  var lastLogin;
   final FocusNode myFocusNode = FocusNode();
-  late int selectedOption = 1;
-  bool onlySMSBox = false;
-  int fingrePrintBefore = 0;
-
   var healthId;
 
   Future<void> onLoginPressed() async {
@@ -134,8 +120,8 @@ class AuthenticationViewModel extends ChangeNotifier {
     notifyListeners();
   }
 
-  void loadCountriesData({required BuildContext context}) async {
-    final String response = await DefaultAssetBundle.of(context).loadString('assets/json/countriesList.json');
+  Future<void> loadCountriesData() async {
+    final String response = await rootBundle.loadString('assets/json/countriesList.json');
     final List<dynamic> data = json.decode(response);
     countriesList = data.map((e) => NationalityCountries.fromJson(e)).toList();
   }
@@ -164,6 +150,18 @@ class AuthenticationViewModel extends ChangeNotifier {
     notifyListeners();
   }
 
+  bool isUserFromUAE() {
+    bool isFromUAE = false;
+    if (_appState.getUserRegistrationPayload.patientOutSa != 0) {
+      isFromUAE = true;
+    }
+    return isFromUAE;
+  }
+
+  void savePushTokenToAppState() async {
+    _appState.deviceToken = await Utils.getStringFromPrefs(CacheConst.pushToken);
+  }
+
   Future<void> selectDeviceImei({required Function(dynamic data) onSuccess, Function(String)? onError}) async {
     // LoadingUtils.showFullScreenLoading();
     // String firebaseToken = _appState.deviceToken;
@@ -293,9 +291,9 @@ class AuthenticationViewModel extends ChangeNotifier {
   }
 
   Future<void> sendActivationCode({required OTPTypeEnum otpTypeEnum, required String nationalIdOrFileNumber, required String phoneNumber, dynamic payload}) async {
-    bool isForRegister = await checkIsUserComingForRegister(request: payload);
-    bool isPatientOutSA = await isPatientOutsideSA(request: payload);
-    bool isFileNo = await isPatientHasFile(request: payload);
+    bool isForRegister = checkIsUserComingForRegister(request: payload);
+    bool isPatientOutSA = isPatientOutsideSA(request: payload);
+    bool isFileNo = isPatientHasFile(request: payload);
 
     var request = RequestUtils.getCommonRequestSendActivationCode(
         otpTypeEnum: otpTypeEnum,
@@ -345,10 +343,9 @@ class AuthenticationViewModel extends ChangeNotifier {
     );
   }
 
-  Future<bool> checkIsUserComingForRegister({required dynamic request}) async {
+  bool checkIsUserComingForRegister({required dynamic request}) {
     bool isUserComingForRegister = false;
-    print(request);
-    if (request != null && request['isRegister']) {
+    if (request != null && request['isRegister'] == true) {
       isUserComingForRegister = true;
     }
     return isUserComingForRegister;
@@ -370,18 +367,20 @@ class AuthenticationViewModel extends ChangeNotifier {
       countryCode: selectedCountrySignup.countryCode,
     ).toJson();
 
-    bool isForRegister = healthId != null || isDubai;
+    bool isForRegister = _appState.getUserRegistrationPayload.healthId != null || _appState.getUserRegistrationPayload.patientOutSa == true;
     if (isForRegister) {
-      if (isDubai) request['DOB'] = dob;
-      request['HealthId'] = healthId;
-      request['IsHijri'] = calenderType.toInt;
+      if (_appState.getUserRegistrationPayload.patientOutSa == true) request['DOB'] = _appState.getUserRegistrationPayload.dob;
+      request['HealthId'] = _appState.getUserRegistrationPayload.healthId;
+      request['IsHijri'] = _appState.getUserRegistrationPayload.isHijri;
 
       final resultEither = await _authenticationRepo.checkActivationCodeRepo(newRequest: request, activationCode: activationCode.toString(), isRegister: true);
 
       resultEither.fold((failure) async => await _errorHandlerService.handleError(failure: failure), (apiResponse) {
         final activation = CheckActivationCode.fromJson(apiResponse.data as Map<String, dynamic>);
-        if (registerd_data?.isRegister == true) {
-          _navigationService.popUntilNamed(AppRoutes.registerNewScreen);
+        if (_appState.getUserRegistrationPayload.isRegister == true) {
+          //TODO: KSA Version Came Hre
+          loadCountriesData();
+          _navigationService.pushAndReplace(AppRoutes.registerStepTwo);
           // Navigator.popUntil(context, (route) => Utils.route(route, equalsTo: RegisterNew));
           return;
         }
@@ -403,8 +402,8 @@ class AuthenticationViewModel extends ChangeNotifier {
         } else if (activation.messageStatus == 2) {
           onWrongActivationCode(activation.errorEndUserMessage);
           return;
-        } else if (registerd_data?.isRegister == true) {
-          _navigationService.popUntilNamed(AppRoutes.registerNewScreen);
+        } else if (_appState.getUserRegistrationPayload.isRegister == true) {
+          _navigationService.pushAndReplace(AppRoutes.registerStepTwo);
           // Navigator.popUntil(context, (route) => Utils.route(route, equalsTo: RegisterNew));
           return;
         } else {
@@ -513,7 +512,6 @@ class AuthenticationViewModel extends ChangeNotifier {
         notifyListeners();
       }
     });
-    this.selectedOption = selectedOption;
     notifyListeners();
   }
 
@@ -569,16 +567,16 @@ class AuthenticationViewModel extends ChangeNotifier {
       } else {
         request['forRegister'] = true;
         request['isRegister'] = true;
-        if (await isPatientOutsideSA(request: response)) {
-          print("=======IN SA=======");
-          chekUserNHICData(request: request);
-        } else {
+        if (isPatientOutsideSA(request: response)) {
           print("=======OUT SA=======");
           _appState.setAppAuthToken = response['LogInTokenID'];
           sendActivationCode(
               otpTypeEnum: OTPTypeEnumExtension.fromInt(request["OTP_SendType"]),
               nationalIdOrFileNumber: request["PatientIdentificationID"].toString(),
               phoneNumber: request["PatientMobileNumber"].toString());
+        } else {
+          print("=======IN SA=======");
+          chekUserNHICData(request: request);
         }
       }
     } else {
@@ -587,23 +585,20 @@ class AuthenticationViewModel extends ChangeNotifier {
     }
   }
 
-  Future<bool> isPatientOutsideSA({required dynamic request}) {
-    try {
-      if (request is Map<String, dynamic> && request.containsKey("PatientOutSA")) {
-        if (!request["PatientOutSA"]) {
-          return Future.value(true);
-        } else {
-          return Future.value(false);
-        }
+  bool isPatientOutsideSA({required dynamic request}) {
+    bool isOutSideSa = false;
+    if (request is Map<String, dynamic> && request.containsKey("PatientOutSA")) {
+      if (request["PatientOutSA"] == true) {
+        isOutSideSa = true;
       } else {
-        return Future.value(false);
+        isOutSideSa = false;
       }
-    } catch (e) {
-      return Future.value(false);
     }
+    print(isOutSideSa);
+    return isOutSideSa;
   }
 
-  Future<bool> isPatientHasFile({required dynamic request}) async {
+  bool isPatientHasFile({required dynamic request}) {
     bool isFile = false;
     if (request != null && request["NationalID"] != null) {
       isFile = request["NationalID"].length < 10;
@@ -615,13 +610,12 @@ class AuthenticationViewModel extends ChangeNotifier {
     final resultEither = await _authenticationRepo.checkUserStatus(commonAuthanticatedRequest: request);
     resultEither.fold((failure) async => await _errorHandlerService.handleError(failure: failure), (apiResponse) async {
       if (apiResponse.data is Map) {
-        _appState.setNHICUserData = CheckUserStatusResponseNHIC.fromJson(apiResponse.data as Map<String, dynamic>);
+        setNHICData(apiResponse.data, request);
         sendActivationCode(
-          otpTypeEnum: OTPTypeEnumExtension.fromInt(request["OTP_SendType"]),
-          nationalIdOrFileNumber: request["PatientIdentificationID"].toString(),
-          phoneNumber: request["PatientMobileNumber"].toString(),
-          payload: request,
-        );
+            otpTypeEnum: OTPTypeEnumExtension.fromInt(request["OTP_SendType"]),
+            nationalIdOrFileNumber: request["PatientIdentificationID"].toString(),
+            phoneNumber: request["PatientMobileNumber"].toString(),
+            payload: request);
       }
     });
 
@@ -661,6 +655,12 @@ class AuthenticationViewModel extends ChangeNotifier {
     // });
   }
 
+  void setNHICData(dynamic data, dynamic request) {
+    _appState.setNHICUserData = CheckUserStatusResponseNHIC.fromJson(data as Map<String, dynamic>);
+    request["healthId"] = _appState.getNHICUserData.healthId;
+    _appState.setUserRegistrationPayload = RegistrationDataModelPayload.fromJson(request);
+  }
+
   @override
   void dispose() {
     nationalIdController.dispose();
diff --git a/lib/features/authentication/models/request_models/registration_payload_model.dart b/lib/features/authentication/models/request_models/registration_payload_model.dart
new file mode 100644
index 0000000..fa4f612
--- /dev/null
+++ b/lib/features/authentication/models/request_models/registration_payload_model.dart
@@ -0,0 +1,69 @@
+import 'dart:convert';
+
+class RegistrationDataModelPayload {
+  int? patientMobileNumber;
+  String? zipCode;
+  int? searchType;
+  int? patientId;
+  int? patientIdentificationId;
+  int? otpSendType;
+  int? patientOutSa;
+  bool? isDentalAllowedBackend;
+  String? dob;
+  int? isHijri;
+  bool? forRegister;
+  bool? isRegister;
+  String? healthId;
+
+  RegistrationDataModelPayload({
+    this.patientMobileNumber,
+    this.zipCode,
+    this.searchType,
+    this.patientId,
+    this.patientIdentificationId,
+    this.otpSendType,
+    this.patientOutSa,
+    this.isDentalAllowedBackend,
+    this.dob,
+    this.isHijri,
+    this.forRegister,
+    this.isRegister,
+    this.healthId,
+  });
+
+  factory RegistrationDataModelPayload.fromRawJson(String str) => RegistrationDataModelPayload.fromJson(json.decode(str));
+
+  String toRawJson() => json.encode(toJson());
+
+  factory RegistrationDataModelPayload.fromJson(Map<String, dynamic> json) => RegistrationDataModelPayload(
+        patientMobileNumber: json["PatientMobileNumber"],
+        zipCode: json["ZipCode"],
+        searchType: json["SearchType"],
+        patientId: json["PatientID"],
+        patientIdentificationId: json["PatientIdentificationID"],
+        otpSendType: json["OTP_SendType"],
+        patientOutSa: json["PatientOutSA"],
+        isDentalAllowedBackend: json["isDentalAllowedBackend"],
+        dob: json["DOB"],
+        isHijri: json["IsHijri"],
+        forRegister: json["forRegister"],
+        isRegister: json["isRegister"],
+        healthId: json["healthId"],
+      );
+
+  Map<String, dynamic> toJson() => {
+        "PatientMobileNumber": patientMobileNumber,
+        "ZipCode": zipCode,
+        "SearchType": searchType,
+        "PatientID": patientId,
+        "PatientIdentificationID": patientIdentificationId,
+        "OTP_SendType": otpSendType,
+        "PatientOutSA": patientOutSa,
+        "isDentalAllowedBackend": isDentalAllowedBackend,
+        "DOB": dob,
+        "IsHijri": isHijri,
+        "forRegister": forRegister,
+        "isRegister": isRegister,
+        "healthId": healthId,
+      };
+}
diff --git a/lib/presentation/authentication/register_step2.dart b/lib/presentation/authentication/register_step2.dart
index 1e4c650..92faaee 100644
--- a/lib/presentation/authentication/register_step2.dart
+++ b/lib/presentation/authentication/register_step2.dart
@@ -19,31 +19,25 @@ import 'package:hmg_patient_app_new/widgets/input_widget.dart';
 import 'package:provider/provider.dart';
 
 class RegisterNewStep2 extends StatefulWidget {
-  var nHICData;
-  var payload;
-
-  RegisterNewStep2(this.nHICData, this.payload, {Key? key}) : super(key: key);
+  RegisterNewStep2({Key? key}) : super(key: key);
 
   @override
   _RegisterNew createState() => _RegisterNew();
 }
 
 class _RegisterNew extends State<RegisterNewStep2> {
-  bool isFromDubai = true;
   AuthenticationViewModel? authVM;
 
   @override
   void initState() {
     super.initState();
     authVM = context.read<AuthenticationViewModel>();
-    authVM!.loadCountriesData(context: context);
-    // isFromDubai = widget.payload.zipCode!.contains("971") || widget.payload.zipCode!.contains("+971");
   }
 
   @override
   void dispose() {
     super.dispose();
-    authVM!.clearDefaultInputValues();
+    // authVM!.clearDefaultInputValues();
   }
 
   @override
@@ -72,22 +66,23 @@ class _RegisterNew extends State<RegisterNewStep2> {
                 child: Column(
                   children: [
                     TextInputWidget(
-                            labelText: isFromDubai ? LocaleKeys.fullName.tr() : LocaleKeys.name.tr(),
-                            hintText: isFromDubai ? "name" ?? "" : (widget.nHICData!.firstNameEn!.toUpperCase() + " " + widget.nHICData!.lastNameEn!.toUpperCase()),
-                            controller: null,
+                            labelText: authVM!.isUserFromUAE() ? LocaleKeys.fullName.tr() : LocaleKeys.name.tr(),
+                            hintText:
+                                authVM!.isUserFromUAE() ? "" : ("${appState.getNHICUserData.firstNameEn!.toUpperCase()} ${appState.getNHICUserData.lastNameEn!.toUpperCase()}"),
+                            controller: authVM!.isUserFromUAE() ? authVM!.nameController : null,
                             isEnable: true,
                             prefix: null,
                             isAllowRadius: false,
                             isBorderAllowed: false,
                             keyboardType: TextInputType.text,
                             isAllowLeadingIcon: true,
-                            isReadOnly: isFromDubai ? false : true,
+                            isReadOnly: authVM!.isUserFromUAE() ? false : true,
                             leadingIcon: AppAssets.user_circle)
                         .paddingSymmetrical(0.h, 16.h),
                     Divider(height: 1, color: AppColors.greyColor),
                     TextInputWidget(
                             labelText: LocaleKeys.nationalIdNumber.tr(),
-                            hintText: isFromDubai ? "widget.payload.nationalID!" : (widget.nHICData!.idNumber ?? ""),
+                            hintText: authVM!.isUserFromUAE() ? appState.getUserRegistrationPayload.patientIdentificationId.toString() : (appState.getNHICUserData.idNumber ?? ""),
                             controller: null,
                             isEnable: true,
                             prefix: null,
@@ -98,7 +93,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
                             leadingIcon: AppAssets.student_card)
                         .paddingSymmetrical(0.h, 16.h),
                     Divider(height: 1, color: AppColors.greyColor),
-                    isFromDubai
+                    authVM!.isUserFromUAE()
                         ? Selector<AuthenticationViewModel, GenderTypeEnum?>(
                             selector: (_, authViewModel) => authViewModel.genderType,
                             shouldRebuild: (previous, next) => previous != next,
@@ -121,19 +116,19 @@ class _RegisterNew extends State<RegisterNewStep2> {
                             })
                         : TextInputWidget(
                                 labelText: LocaleKeys.gender.tr(),
-                                hintText: (widget.nHICData!.gender ?? ""),
+                                hintText: (appState.getNHICUserData.gender ?? ""),
                                 controller: null,
                                 isEnable: true,
                                 prefix: null,
                                 isAllowRadius: false,
                                 isBorderAllowed: false,
                                 isAllowLeadingIcon: true,
-                                isReadOnly: isFromDubai ? false : true,
+                                isReadOnly: authVM!.isUserFromUAE() ? false : true,
                                 leadingIcon: AppAssets.user_full,
                                 onChange: (value) {})
                             .paddingSymmetrical(0.h, 16.h),
                     Divider(height: 1, color: AppColors.greyColor),
-                    isFromDubai
+                    authVM!.isUserFromUAE()
                         ? Selector<AuthenticationViewModel, MaritalStatusTypeEnum?>(
                             selector: (_, authViewModel) => authViewModel.maritalStatus,
                             shouldRebuild: (previous, next) => previous != next,
@@ -158,8 +153,8 @@ class _RegisterNew extends State<RegisterNewStep2> {
                         : TextInputWidget(
                                 labelText: LocaleKeys.maritalStatus.tr(),
                                 hintText: appState.isArabic()
-                                    ? (MaritalStatusTypeExtension.fromValue(widget.nHICData!.maritalStatusCode)!.typeAr)
-                                    : (MaritalStatusTypeExtension.fromValue(widget.nHICData!.maritalStatusCode)!.type),
+                                    ? (MaritalStatusTypeExtension.fromValue(appState.getNHICUserData.maritalStatusCode)!.typeAr)
+                                    : (MaritalStatusTypeExtension.fromValue(appState.getNHICUserData.maritalStatusCode)!.type),
                                 isEnable: true,
                                 prefix: null,
                                 isAllowRadius: false,
@@ -170,7 +165,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
                                 onChange: (value) {})
                             .paddingSymmetrical(0.h, 16.h),
                     Divider(height: 1, color: AppColors.greyColor),
-                    isFromDubai
+                    authVM!.isUserFromUAE()
                         ? Selector<AuthenticationViewModel, ({List<NationalityCountries>? countriesList, NationalityCountries? selectedCountry, bool isArabic})>(
                             selector: (context, authViewModel) {
                               final appState = getIt.get<AppState>();
@@ -206,8 +201,8 @@ class _RegisterNew extends State<RegisterNewStep2> {
                         : TextInputWidget(
                                 labelText: LocaleKeys.nationality.tr(),
                                 hintText: appState.isArabic()
-                                    ? (authVM!.countriesList!.firstWhere((e) => e.id == (widget.nHICData!.nationalityCode ?? ""), orElse: () => NationalityCountries()).nameN ?? "")
-                                    : (authVM!.countriesList!.firstWhere((e) => e.id == (widget.nHICData!.nationalityCode ?? ""), orElse: () => NationalityCountries()).name ?? ""),
+                                    ? (authVM!.countriesList!.firstWhere((e) => e.id == (appState.getNHICUserData.nationalityCode ?? ""), orElse: () => NationalityCountries()).nameN ?? "")
+                                    : (authVM!.countriesList!.firstWhere((e) => e.id == (appState.getNHICUserData.nationalityCode ?? ""), orElse: () => NationalityCountries()).name ?? ""),
                                 isEnable: true,
                                 prefix: null,
                                 isAllowRadius: false,
@@ -223,7 +218,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
                     ),
                     TextInputWidget(
                             labelText: LocaleKeys.mobileNumber.tr(),
-                            hintText: ("widget.payload.mobileNo" ?? ""),
+                            hintText: (appState.getUserRegistrationPayload.patientMobileNumber.toString() ?? ""),
                             controller: authVM!.phoneNumberController,
                             isEnable: true,
                             prefix: null,
@@ -240,15 +235,15 @@ class _RegisterNew extends State<RegisterNewStep2> {
                     ),
                     TextInputWidget(
                       labelText: LocaleKeys.dob.tr(),
-                      hintText: isFromDubai ? "widget.payload.dob!" : (widget.nHICData!.dateOfBirth ?? ""),
+                      hintText: authVM!.isUserFromUAE() ? appState.getUserRegistrationPayload.dob! : (appState.getNHICUserData.dateOfBirth ?? ""),
                       controller: authVM!.dobController,
-                      isEnable: true,
+                      isEnable: authVM!.isUserFromUAE() ? true : false,
                       prefix: null,
                       isBorderAllowed: false,
                       isAllowLeadingIcon: true,
                       isReadOnly: true,
                       leadingIcon: AppAssets.birthday_cake,
-                      selectionType: SelectionTypeEnum.calendar,
+                      selectionType: authVM!.isUserFromUAE() ? SelectionTypeEnum.calendar : null,
                     ).paddingSymmetrical(0.h, 16.h),
                   ],
                 ),
diff --git a/lib/presentation/home/landing_page.dart b/lib/presentation/home/landing_page.dart
index b33658f..29bed41 100644
--- a/lib/presentation/home/landing_page.dart
+++ b/lib/presentation/home/landing_page.dart
@@ -39,6 +39,7 @@ class _LandingPageState extends State<LandingPage> {
   @override
   void initState() {
     authVM = context.read<AuthenticationViewModel>();
+    authVM.savePushTokenToAppState();
     if (mounted) {
       authVM.checkLastLoginStatus(() {
         // showQuickLogin(context, false);
diff --git a/lib/routes/app_routes.dart b/lib/routes/app_routes.dart
index 93146d6..67bf208 100644
--- a/lib/routes/app_routes.dart
+++ b/lib/routes/app_routes.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hmg_patient_app_new/presentation/authentication/login.dart';
+import 'package:hmg_patient_app_new/presentation/authentication/register.dart';
+import 'package:hmg_patient_app_new/presentation/authentication/register_step2.dart';
 import 'package:hmg_patient_app_new/presentation/home/landing_page.dart';
 import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart';
 import 'package:hmg_patient_app_new/splashPage.dart';
@@ -7,12 +9,15 @@ import 'package:hmg_patient_app_new/splashPage.dart';
 class AppRoutes {
   static const String initialRoute = '/initialRoute';
   static const String loginScreen = '/loginScreen';
-  static const String registerNewScreen = '/registerNewScreen';
+  static const String register = '/register';
+  static const String registerStepTwo = '/registerStepTwo';
   static const String landingScreen = '/landingScreen';
 
   static Map<String, WidgetBuilder> get routes => {
         initialRoute: (context) => SplashPage(),
         loginScreen: (context) => LoginScreen(),
         landingScreen: (context) => LandingNavigation(),
+        register: (context) => RegisterNew(),
+        registerStepTwo: (context) => RegisterNewStep2(),
       };
 }
diff --git a/lib/widgets/dropdown/country_dropdown_widget.dart b/lib/widgets/dropdown/country_dropdown_widget.dart
index 3d28e23..4e41c31 100644
--- a/lib/widgets/dropdown/country_dropdown_widget.dart
+++ b/lib/widgets/dropdown/country_dropdown_widget.dart
@@ -105,7 +105,7 @@ class _CustomCountryDropdownState extends State<CustomCountryDropdown> {
                       SizedBox(width: 4.h),
                       if (widget.isEnableTextField)
                         SizedBox(
-                          height: 20,
+                          height: 18,
                           width: 200,
                           child: TextField(
                               focusNode: textFocusNode,