diff --git a/assets/json/countriesList.json b/assets/json/countriesList.json
new file mode 100644
index 0000000..25a65b3
--- /dev/null
+++ b/assets/json/countriesList.json
@@ -0,0 +1,1212 @@
+[
+  {
+    "ID": "AFG",
+    "Name": "Afghan",
+    "NameN": "أفغاني"
+  },
+  {
+    "ID": "CAF",
+    "Name": "African",
+    "NameN": "أفريقي"
+  },
+  {
+    "ID": "ALB",
+    "Name": "Albanian",
+    "NameN": "ألباني"
+  },
+  {
+    "ID": "DZA",
+    "Name": "Algerian",
+    "NameN": "جزائري"
+  },
+  {
+    "ID": "USA",
+    "Name": "American",
+    "NameN": "أمريكي"
+  },
+  {
+    "ID": "UMI",
+    "Name": "American (Minor Outlying Islands)",
+    "NameN": "أمريكي (الجزر الصغرى النائية)"
+  },
+  {
+    "ID": "ASM",
+    "Name": "American Samoa",
+    "NameN": "ساموا الأمريكية"
+  },
+  {
+    "ID": "AND",
+    "Name": "Andorrian",
+    "NameN": "أندوري"
+  },
+  {
+    "ID": "AGO",
+    "Name": "Angolan",
+    "NameN": "أنغولي"
+  },
+  {
+    "ID": "AIA",
+    "Name": "Anguillan",
+    "NameN": "أنغيلي"
+  },
+  {
+    "ID": "ATA",
+    "Name": "Antarctica",
+    "NameN": "أنتاركتيكا"
+  },
+  {
+    "ID": "ATG",
+    "Name": "Antiguans, Barbudans",
+    "NameN": "أنتيغوي، باربودي"
+  },
+  {
+    "ID": "ARG",
+    "Name": "Argentine",
+    "NameN": "أرجنتيني"
+  },
+  {
+    "ID": "ARM",
+    "Name": "Armenian",
+    "NameN": "أرمني"
+  },
+  {
+    "ID": "ABW",
+    "Name": "Arubian",
+    "NameN": "أروبي"
+  },
+  {
+    "ID": "AUS",
+    "Name": "Australian",
+    "NameN": "أسترالي"
+  },
+  {
+    "ID": "AUT",
+    "Name": "Austrian",
+    "NameN": "نمساوي"
+  },
+  {
+    "ID": "AZE",
+    "Name": "Azeri",
+    "NameN": "أذربيجاني"
+  },
+  {
+    "ID": "BHS",
+    "Name": "Bahamian",
+    "NameN": "باهامي"
+  },
+  {
+    "ID": "BHR",
+    "Name": "Bahraini",
+    "NameN": "بحريني"
+  },
+  {
+    "ID": "BRB",
+    "Name": "Barbadian or Bajuns",
+    "NameN": "باربادوسي"
+  },
+  {
+    "ID": "BLR",
+    "Name": "Belarusian",
+    "NameN": "بيلاروسي"
+  },
+  {
+    "ID": "BEL",
+    "Name": "Belgian",
+    "NameN": "بلجيكي"
+  },
+  {
+    "ID": "BLZ",
+    "Name": "Belizean",
+    "NameN": "بليزي"
+  },
+  {
+    "ID": "BGD",
+    "Name": "Bengali",
+    "NameN": "بنغلاديشي"
+  },
+  {
+    "ID": "BEN",
+    "Name": "Beninese",
+    "NameN": "بنيني"
+  },
+  {
+    "ID": "BMU",
+    "Name": "Bermudian",
+    "NameN": "برمودي"
+  },
+  {
+    "ID": "BTN",
+    "Name": "Bhutanese",
+    "NameN": "بوتاني"
+  },
+  {
+    "ID": "BOL",
+    "Name": "Bolivian",
+    "NameN": "بوليفي"
+  },
+  {
+    "ID": "BIH",
+    "Name": "Bosnian And Herzegovinian",
+    "NameN": "بوسني وهرسكي"
+  },
+  {
+    "ID": "BWA",
+    "Name": "Botswanian",
+    "NameN": "بوتسواني"
+  },
+  {
+    "ID": "BVT",
+    "Name": "Bouvet Island (Bouvetoya)",
+    "NameN": "جزيرة بوفيه"
+  },
+  {
+    "ID": "BRA",
+    "Name": "Brazilian",
+    "NameN": "برازيلي"
+  },
+  {
+    "ID": "GBR",
+    "Name": "British",
+    "NameN": "بريطاني"
+  },
+  {
+    "ID": "IOT",
+    "Name": "British (Chagos Archipelago)",
+    "NameN": "بريطاني (أرخبيل شاغوس)"
+  },
+  {
+    "ID": "VGB",
+    "Name": "British (Virgin Islands)",
+    "NameN": "بريطاني (الجزر العذراء)"
+  },
+  {
+    "ID": "BRN",
+    "Name": "Bruneian",
+    "NameN": "بروني"
+  },
+  {
+    "ID": "BGR",
+    "Name": "Bulgarian",
+    "NameN": "بلغاري"
+  },
+  {
+    "ID": "MMR",
+    "Name": "Burmese or Myanmarese",
+    "NameN": "بورمي أو ميانماري"
+  },
+  {
+    "ID": "BFA",
+    "Name": "Burnikabe",
+    "NameN": "بوركيني"
+  },
+  {
+    "ID": "BDI",
+    "Name": "Burundi",
+    "NameN": "بوروندي"
+  },
+  {
+    "ID": "KHM",
+    "Name": "Cambodian",
+    "NameN": "كمبودي"
+  },
+  {
+    "ID": "CMR",
+    "Name": "Cameroonian",
+    "NameN": "كاميروني"
+  },
+  {
+    "ID": "CAN",
+    "Name": "Canadian",
+    "NameN": "كندي"
+  },
+  {
+    "ID": "CPV",
+    "Name": "Cape Verdian or Cape Verdean",
+    "NameN": "رأس أخضري"
+  },
+  {
+    "ID": "CYM",
+    "Name": "Cayman Islander",
+    "NameN": "جزر كايماني"
+  },
+  {
+    "ID": "TCD",
+    "Name": "Chadian",
+    "NameN": "تشادي"
+  },
+  {
+    "ID": "CHL",
+    "Name": "Chilean",
+    "NameN": "تشيلي"
+  },
+  {
+    "ID": "HKG",
+    "Name": "Chinese (Hong Kong)",
+    "NameN": "صيني (هونغ كونغ)"
+  },
+  {
+    "ID": "MAC",
+    "Name": "Chinese (Macao)",
+    "NameN": "صيني (ماكاو)"
+  },
+  {
+    "ID": "CHN",
+    "Name": "Chinese",
+    "NameN": "صيني"
+  },
+  {
+    "ID": "CXR",
+    "Name": "Christmas Island",
+    "NameN": "جزيرة الكريسماس"
+  },
+  {
+    "ID": "CCK",
+    "Name": "Cocos (Keeling) Islands",
+    "NameN": "جزر كوكوس (كيلنغ)"
+  },
+  {
+    "ID": "COL",
+    "Name": "Colombian",
+    "NameN": "كولومبي"
+  },
+  {
+    "ID": "COM",
+    "Name": "Comoran",
+    "NameN": "قمري"
+  },
+  {
+    "ID": "COG",
+    "Name": "Congolese",
+    "NameN": "كونغولي"
+  },
+  {
+    "ID": "COD",
+    "Name": "Congolese (Zaire)",
+    "NameN": "كونغولي (زائير)"
+  },
+  {
+    "ID": "COK",
+    "Name": "Cook Islander",
+    "NameN": "جزر كوك"
+  },
+  {
+    "ID": "CRI",
+    "Name": "Costa Rican",
+    "NameN": "كوستاريكي"
+  },
+  {
+    "ID": "HRV",
+    "Name": "Croat",
+    "NameN": "كرواتي"
+  },
+  {
+    "ID": "CUB",
+    "Name": "Cuban",
+    "NameN": "كوبي"
+  },
+  {
+    "ID": "CYP",
+    "Name": "Cypriot, Greek",
+    "NameN": "قبرصي، يوناني"
+  },
+  {
+    "ID": "CZE",
+    "Name": "Czech",
+    "NameN": "تشيكي"
+  },
+  {
+    "ID": "DNK",
+    "Name": "Danish",
+    "NameN": "دنماركي"
+  },
+  {
+    "ID": "DJI",
+    "Name": "Djibouti",
+    "NameN": "جيبوتي"
+  },
+  {
+    "ID": "DOM",
+    "Name": "Dominican",
+    "NameN": "دومينيكاني"
+  },
+  {
+    "ID": "DMA",
+    "Name": "Dominican (Commonwealth)",
+    "NameN": "دومينيكي (الكومنولث)"
+  },
+  {
+    "ID": "ANT",
+    "Name": "Dutch (Antilles)",
+    "NameN": "هولندي (الأنتيل)"
+  },
+  {
+    "ID": "NLD",
+    "Name": "Dutch (Netherlands)",
+    "NameN": "هولندي (هولندا)"
+  },
+  {
+    "ID": "ECU",
+    "Name": "Ecuadorean",
+    "NameN": "إكوادوري"
+  },
+  {
+    "ID": "EGY",
+    "Name": "Egyptians",
+    "NameN": "مصري"
+  },
+  {
+    "ID": "ARE",
+    "Name": "Emirati",
+    "NameN": "إماراتي"
+  },
+  {
+    "ID": "GNQ",
+    "Name": "Equatorial Guinean or Equatoguinean",
+    "NameN": "غيني استوائي"
+  },
+  {
+    "ID": "ERI",
+    "Name": "Eritrean",
+    "NameN": "إريتري"
+  },
+  {
+    "ID": "EST",
+    "Name": "Estonian",
+    "NameN": "إستوني"
+  },
+  {
+    "ID": "ETH",
+    "Name": "Ethiopian",
+    "NameN": "إثيوبي"
+  },
+  {
+    "ID": "FRO",
+    "Name": "Faeroe Islander",
+    "NameN": "جزر فارو"
+  },
+  {
+    "ID": "FLK",
+    "Name": "Falkland Islander",
+    "NameN": "جزر فوكلاند"
+  },
+  {
+    "ID": "FJI",
+    "Name": "Fijian",
+    "NameN": "فيجي"
+  },
+  {
+    "ID": "PHL",
+    "Name": "Filipino",
+    "NameN": "فلبيني"
+  },
+  {
+    "ID": "FIN",
+    "Name": "Finnish",
+    "NameN": "فنلندي"
+  },
+  {
+    "ID": "FRA",
+    "Name": "French",
+    "NameN": "فرنسي"
+  },
+  {
+    "ID": "GUF",
+    "Name": "French Guianian",
+    "NameN": "غويانا الفرنسية"
+  },
+  {
+    "ID": "PYF",
+    "Name": "French Polynesian",
+    "NameN": "بولينيزيا الفرنسية"
+  },
+  {
+    "ID": "ATF",
+    "Name": "French Southern Territories",
+    "NameN": "الأقاليم الجنوبية الفرنسية"
+  },
+  {
+    "ID": "GAB",
+    "Name": "Gabonese",
+    "NameN": "غابوني"
+  },
+  {
+    "ID": "GMB",
+    "Name": "Gambian",
+    "NameN": "غامبي"
+  },
+  {
+    "ID": "GEO",
+    "Name": "Georgian",
+    "NameN": "جورجي"
+  },
+  {
+    "ID": "SGS",
+    "Name": "Georgian (South)",
+    "NameN": "جورجي (جنوبي)"
+  },
+  {
+    "ID": "DEU",
+    "Name": "German",
+    "NameN": "ألماني"
+  },
+  {
+    "ID": "GHA",
+    "Name": "Ghanaian",
+    "NameN": "غاني"
+  },
+  {
+    "ID": "GIB",
+    "Name": "Gibraltarian",
+    "NameN": "جبل طارقي"
+  },
+  {
+    "ID": "GRC",
+    "Name": "Greek",
+    "NameN": "يوناني"
+  },
+  {
+    "ID": "GRL",
+    "Name": "Greenlander",
+    "NameN": "غرينلاندي"
+  },
+  {
+    "ID": "GRD",
+    "Name": "Grenadian or Grenadan",
+    "NameN": "غرينادي"
+  },
+  {
+    "ID": "GLP",
+    "Name": "Guadeloupian",
+    "NameN": "غوادلوبي"
+  },
+  {
+    "ID": "GUM",
+    "Name": "Guamanian",
+    "NameN": "غوامي"
+  },
+  {
+    "ID": "GTM",
+    "Name": "Guatemalan",
+    "NameN": "غواتيمالي"
+  },
+  {
+    "ID": "GNB",
+    "Name": "Guinea-Bissauan",
+    "NameN": "غيني بيساوي"
+  },
+  {
+    "ID": "GIN",
+    "Name": "Guinean",
+    "NameN": "غيني"
+  },
+  {
+    "ID": "GUY",
+    "Name": "Guyanese",
+    "NameN": "غيانيزي"
+  },
+  {
+    "ID": "HTI",
+    "Name": "Haitian",
+    "NameN": "هايتيني"
+  },
+  {
+    "ID": "HMD",
+    "Name": "Heard and McDonald Islands",
+    "NameN": "جزر هيرد وماكدونالد"
+  },
+  {
+    "ID": "HND",
+    "Name": "Honduran",
+    "NameN": "هندوراسي"
+  },
+  {
+    "ID": "HUN",
+    "Name": "Hungarian",
+    "NameN": "مجري"
+  },
+  {
+    "ID": "ISL",
+    "Name": "Icelander",
+    "NameN": "آيسلندي"
+  },
+  {
+    "ID": "KIR",
+    "Name": "I-Kiribati",
+    "NameN": "كيريباتي"
+  },
+  {
+    "ID": "IND",
+    "Name": "Indian",
+    "NameN": "هندي"
+  },
+  {
+    "ID": "IDN",
+    "Name": "Indonesian",
+    "NameN": "إندونيسي"
+  },
+  {
+    "ID": "IRN",
+    "Name": "Iranian",
+    "NameN": "إيراني"
+  },
+  {
+    "ID": "IRQ",
+    "Name": "Iraqi",
+    "NameN": "عراقي"
+  },
+  {
+    "ID": "IRL",
+    "Name": "Irish",
+    "NameN": "إيرلندي"
+  },
+  {
+    "ID": "ITA",
+    "Name": "Italian",
+    "NameN": "إيطالي"
+  },
+  {
+    "ID": "CIV",
+    "Name": "Ivoirian",
+    "NameN": "إيفواري"
+  },
+  {
+    "ID": "JAM",
+    "Name": "Jamaican",
+    "NameN": "جامايكي"
+  },
+  {
+    "ID": "JPN",
+    "Name": "Japanese",
+    "NameN": "ياباني"
+  },
+  {
+    "ID": "JOR",
+    "Name": "Jordanian",
+    "NameN": "أردني"
+  },
+  {
+    "ID": "KAZ",
+    "Name": "Kazakhstani",
+    "NameN": "كازاخستاني"
+  },
+  {
+    "ID": "KEN",
+    "Name": "Kenyan",
+    "NameN": "كيني"
+  },
+  {
+    "ID": "KGZ",
+    "Name": "Kirghiz",
+    "NameN": "قيرغيزي"
+  },
+  {
+    "ID": "KOR",
+    "Name": "Korean",
+    "NameN": "كوري"
+  },
+  {
+    "ID": "PRK",
+    "Name": "Korean",
+    "NameN": "كوري"
+  },
+  {
+    "ID": "KWT",
+    "Name": "Kuwaiti",
+    "NameN": "كويتي"
+  },
+  {
+    "ID": "LAO",
+    "Name": "Laotian",
+    "NameN": "لاوسي"
+  },
+  {
+    "ID": "LVA",
+    "Name": "Latvian",
+    "NameN": "لاتفي"
+  },
+  {
+    "ID": "LBN",
+    "Name": "Lebanese",
+    "NameN": "لبناني"
+  },
+  {
+    "ID": "LBR",
+    "Name": "Liberian",
+    "NameN": "ليبيري"
+  },
+  {
+    "ID": "LBY",
+    "Name": "Libyan",
+    "NameN": "ليبي"
+  },
+  {
+    "ID": "LIE",
+    "Name": "Liechtensteiner",
+    "NameN": "ليختنشتايني"
+  },
+  {
+    "ID": "LTU",
+    "Name": "Lithuanian",
+    "NameN": "ليتواني"
+  },
+  {
+    "ID": "LUX",
+    "Name": "Luxembourger",
+    "NameN": "لوكسمبورغي"
+  },
+  {
+    "ID": "MKD",
+    "Name": "Macedonia, the former Yugoslav Republic of",
+    "NameN": "مقدوني، جمهورية يوغوسلافيا السابقة"
+  },
+  {
+    "ID": "MYT",
+    "Name": "Mahorais",
+    "NameN": "مايوتي"
+  },
+  {
+    "ID": "MDG",
+    "Name": "Malagasy",
+    "NameN": "مدغشقري"
+  },
+  {
+    "ID": "MWI",
+    "Name": "Malawian",
+    "NameN": "مالاوي"
+  },
+  {
+    "ID": "MYS",
+    "Name": "Malaysian",
+    "NameN": "ماليزي"
+  },
+  {
+    "ID": "MDV",
+    "Name": "Maldivan",
+    "NameN": "مالديفي"
+  },
+  {
+    "ID": "MLI",
+    "Name": "Malian",
+    "NameN": "مالي"
+  },
+  {
+    "ID": "MLT",
+    "Name": "Maltese",
+    "NameN": "مالطي"
+  },
+  {
+    "ID": "MHL",
+    "Name": "Marshallese",
+    "NameN": "مارشالي"
+  },
+  {
+    "ID": "MTQ",
+    "Name": "Martiniquais",
+    "NameN": "مارتينيكي"
+  },
+  {
+    "ID": "MRT",
+    "Name": "Mauritanian",
+    "NameN": "موريتاني"
+  },
+  {
+    "ID": "MUS",
+    "Name": "Mauritian",
+    "NameN": "موريشيوسي"
+  },
+  {
+    "ID": "MEX",
+    "Name": "Mexican",
+    "NameN": "مكسيكي"
+  },
+  {
+    "ID": "FSM",
+    "Name": "Micronesian",
+    "NameN": "ميكرونيزي"
+  },
+  {
+    "ID": "MDA",
+    "Name": "Moldovian",
+    "NameN": "مولدوفي"
+  },
+  {
+    "ID": "MCO",
+    "Name": "Monegasque or Monacan",
+    "NameN": "موناكي"
+  },
+  {
+    "ID": "MNG",
+    "Name": "Mongolian",
+    "NameN": "منغولي"
+  },
+  {
+    "ID": "MNE",
+    "Name": "Montenegrin",
+    "NameN": "جبل أسودي"
+  },
+  {
+    "ID": "MSR",
+    "Name": "Montserratian",
+    "NameN": "مونتسيراتي"
+  },
+  {
+    "ID": "MAR",
+    "Name": "Moroccan",
+    "NameN": "مغربي"
+  },
+  {
+    "ID": "LSO",
+    "Name": "Mosotho",
+    "NameN": "ليسوتي"
+  },
+  {
+    "ID": "MOZ",
+    "Name": "Mozambican",
+    "NameN": "موزمبيقي"
+  },
+  {
+    "ID": "NAM",
+    "Name": "Namibian",
+    "NameN": "ناميبي"
+  },
+  {
+    "ID": "NRU",
+    "Name": "Nauruan",
+    "NameN": "ناوروي"
+  },
+  {
+    "ID": "NPL",
+    "Name": "Nepalese",
+    "NameN": "نيبالي"
+  },
+  {
+    "ID": "NCL",
+    "Name": "New Caledonian",
+    "NameN": "كاليدوني جديد"
+  },
+  {
+    "ID": "NZL",
+    "Name": "New Zealand",
+    "NameN": "نيوزيلندي"
+  },
+  {
+    "ID": "VUT",
+    "Name": "Ni- Vanuatu",
+    "NameN": "فانواتي"
+  },
+  {
+    "ID": "NIC",
+    "Name": "Nicaraguan",
+    "NameN": "نيكاراغوي"
+  },
+  {
+    "ID": "NGA",
+    "Name": "Nigerian",
+    "NameN": "نيجيري"
+  },
+  {
+    "ID": "NER",
+    "Name": "Nigerien",
+    "NameN": "نيجري"
+  },
+  {
+    "ID": "NIU",
+    "Name": "Niuean",
+    "NameN": "نيوي"
+  },
+  {
+    "ID": "VAT",
+    "Name": "None (Vatican City)",
+    "NameN": "لا شيء (مدينة الفاتيكان)"
+  },
+  {
+    "ID": "NFK",
+    "Name": "Norfolk Islander",
+    "NameN": "جزيرة نورفولك"
+  },
+  {
+    "ID": "MNP",
+    "Name": "Northern Mariana Islander",
+    "NameN": "جزر ماريانا الشمالية"
+  },
+  {
+    "ID": "NOR",
+    "Name": "Norwegean",
+    "NameN": "نرويجي"
+  },
+  {
+    "ID": "OMN",
+    "Name": "Omani",
+    "NameN": "عماني"
+  },
+  {
+    "ID": "OTH",
+    "Name": "OTHERS",
+    "NameN": "آخرون"
+  },
+  {
+    "ID": "PAK",
+    "Name": "Pakistani",
+    "NameN": "باكستاني"
+  },
+  {
+    "ID": "PLW",
+    "Name": "Palauan",
+    "NameN": "بالاوي"
+  },
+  {
+    "ID": "PSE",
+    "Name": "Palestinian",
+    "NameN": "فلسطيني"
+  },
+  {
+    "ID": "PAN",
+    "Name": "Panamanian",
+    "NameN": "بنمي"
+  },
+  {
+    "ID": "PNG",
+    "Name": "Papua New Guinean",
+    "NameN": "بابوا غيني جديد"
+  },
+  {
+    "ID": "PRY",
+    "Name": "Paraguayan",
+    "NameN": "باراغوايي"
+  },
+  {
+    "ID": "PER",
+    "Name": "Peruvian",
+    "NameN": "بيروفي"
+  },
+  {
+    "ID": "PCN",
+    "Name": "Pitcairn Islander",
+    "NameN": "جزر بيتكايرن"
+  },
+  {
+    "ID": "POL",
+    "Name": "Polish",
+    "NameN": "بولندي"
+  },
+  {
+    "ID": "PRT",
+    "Name": "Portuguese",
+    "NameN": "برتغالي"
+  },
+  {
+    "ID": "PRI",
+    "Name": "Puerto Rican",
+    "NameN": "بورتوريكي"
+  },
+  {
+    "ID": "QAT",
+    "Name": "Qatari",
+    "NameN": "قطري"
+  },
+  {
+    "ID": "RKS",
+    "Name": "Republic of Kosovo",
+    "NameN": "جمهورية كوسوفو"
+  },
+  {
+    "ID": "REU",
+    "Name": "Reunionese",
+    "NameN": "ريونيوني"
+  },
+  {
+    "ID": "ROU",
+    "Name": "Romanian",
+    "NameN": "روماني"
+  },
+  {
+    "ID": "RUS",
+    "Name": "Russian",
+    "NameN": "روسي"
+  },
+  {
+    "ID": "RWA",
+    "Name": "Rwandan",
+    "NameN": "رواندي"
+  },
+  {
+    "ID": "ESH",
+    "Name": "Sahrawi",
+    "NameN": "صحراوي"
+  },
+  {
+    "ID": "SLV",
+    "Name": "Salvadoran",
+    "NameN": "سلفادوري"
+  },
+  {
+    "ID": "SMR",
+    "Name": "Sammarinese",
+    "NameN": "سان مارينو"
+  },
+  {
+    "ID": "WSM",
+    "Name": "Samoan",
+    "NameN": "ساموي"
+  },
+  {
+    "ID": "STP",
+    "Name": "Sao Tomean",
+    "NameN": "ساو تومي"
+  },
+  {
+    "ID": "SAU",
+    "Name": "Saudi",
+    "NameN": "سعودي"
+  },
+  {
+    "ID": "SCT",
+    "Name": "Scottish",
+    "NameN": "اسكتلندي"
+  },
+  {
+    "ID": "SEN",
+    "Name": "Senegalese",
+    "NameN": "سنغالي"
+  },
+  {
+    "ID": "SRB",
+    "Name": "Serbian",
+    "NameN": "صربي"
+  },
+  {
+    "ID": "SYC",
+    "Name": "Seychellois",
+    "NameN": "سيشيلي"
+  },
+  {
+    "ID": "SLE",
+    "Name": "Sierra Leonean",
+    "NameN": "سيراليوني"
+  },
+  {
+    "ID": "SGP",
+    "Name": "Singaporian",
+    "NameN": "سنغافوري"
+  },
+  {
+    "ID": "SVK",
+    "Name": "Slovak",
+    "NameN": "سلوفاكي"
+  },
+  {
+    "ID": "SVN",
+    "Name": "Slovene",
+    "NameN": "سلوفيني"
+  },
+  {
+    "ID": "SLB",
+    "Name": "Solomon Islander",
+    "NameN": "جزر سليمان"
+  },
+  {
+    "ID": "SOM",
+    "Name": "Somalian",
+    "NameN": "صومالي"
+  },
+  {
+    "ID": "ZAF",
+    "Name": "South African",
+    "NameN": "جنوب أفريقي"
+  },
+  {
+    "ID": "ESP",
+    "Name": "Spanish",
+    "NameN": "إسباني"
+  },
+  {
+    "ID": "LKA",
+    "Name": "Sri Lankan",
+    "NameN": "سريلانكي"
+  },
+  {
+    "ID": "SHN",
+    "Name": "St. Helena",
+    "NameN": "سانت هيلينا"
+  },
+  {
+    "ID": "KNA",
+    "Name": "St. Kitts and Nevis",
+    "NameN": "سانت كيتس ونيفيس"
+  },
+  {
+    "ID": "LCA",
+    "Name": "St. Lucia",
+    "NameN": "سانت لوسيا"
+  },
+  {
+    "ID": "SPM",
+    "Name": "St. Pierre and Miquelon",
+    "NameN": "سانت بيير وميكيلون"
+  },
+  {
+    "ID": "VCT",
+    "Name": "St. Vincent and the Grenadines",
+    "NameN": "سانت فنسنت والغرينادين"
+  },
+  {
+    "ID": "SDN",
+    "Name": "Sudanese",
+    "NameN": "سوداني"
+  },
+  {
+    "ID": "SUR",
+    "Name": "Surinamer",
+    "NameN": "سورينامي"
+  },
+  {
+    "ID": "SJM",
+    "Name": "Svalbard and Jan Mayen islander",
+    "NameN": "سفالبارد وجان ماين"
+  },
+  {
+    "ID": "SWZ",
+    "Name": "Swazi",
+    "NameN": "سوازي"
+  },
+  {
+    "ID": "SWE",
+    "Name": "Swedish",
+    "NameN": "سويدي"
+  },
+  {
+    "ID": "CHE",
+    "Name": "Swiss",
+    "NameN": "سويسري"
+  },
+  {
+    "ID": "SYR",
+    "Name": "Syrian",
+    "NameN": "سوري"
+  },
+  {
+    "ID": "TWN",
+    "Name": "Taiwan, Province of China",
+    "NameN": "تايوان، مقاطعة الصين"
+  },
+  {
+    "ID": "TJK",
+    "Name": "Tajik",
+    "NameN": "طاجيكي"
+  },
+  {
+    "ID": "TZA",
+    "Name": "Tanzania, United Republic o",
+    "NameN": "تنزاني، الجمهورية المتحدة"
+  },
+  {
+    "ID": "THA",
+    "Name": "Thai",
+    "NameN": "تايلندي"
+  },
+  {
+    "ID": "TLS",
+    "Name": "Timorese",
+    "NameN": "تيموري"
+  },
+  {
+    "ID": "TGO",
+    "Name": "Togolese",
+    "NameN": "توغولي"
+  },
+  {
+    "ID": "TKL",
+    "Name": "Tokelauan",
+    "NameN": "توكيلاوي"
+  },
+  {
+    "ID": "TON",
+    "Name": "Tongan",
+    "NameN": "تونغي"
+  },
+  {
+    "ID": "TTO",
+    "Name": "Trinidadian",
+    "NameN": "ترينيدادي"
+  },
+  {
+    "ID": "TUN",
+    "Name": "Tunisian",
+    "NameN": "تونسي"
+  },
+  {
+    "ID": "TCA",
+    "Name": "Turk",
+    "NameN": "تركي"
+  },
+  {
+    "ID": "TUR",
+    "Name": "Turkish",
+    "NameN": "تركي"
+  },
+  {
+    "ID": "TKM",
+    "Name": "Turkmen",
+    "NameN": "تركماني"
+  },
+  {
+    "ID": "TUV",
+    "Name": "Tuvaluan",
+    "NameN": "توفالوي"
+  },
+  {
+    "ID": "UGA",
+    "Name": "Ugandan",
+    "NameN": "أوغندي"
+  },
+  {
+    "ID": "UKR",
+    "Name": "Ukrainian",
+    "NameN": "أوكراني"
+  },
+  {
+    "ID": "URY",
+    "Name": "Uruguayan",
+    "NameN": "أوروغوايي"
+  },
+  {
+    "ID": "UZB",
+    "Name": "Uzbek",
+    "NameN": "أوزبكي"
+  },
+  {
+    "ID": "VEN",
+    "Name": "Venenzuelan",
+    "NameN": "فنزويلي"
+  },
+  {
+    "ID": "VNM",
+    "Name": "Vietnamese",
+    "NameN": "فيتنامي"
+  },
+  {
+    "ID": "VIR",
+    "Name": "Virgin Islander",
+    "NameN": "جزر عذراء"
+  },
+  {
+    "ID": "WLF",
+    "Name": "Wallis and Futuna Islander",
+    "NameN": "واليس وفوتونا"
+  },
+  {
+    "ID": "YEM",
+    "Name": "Yemeni",
+    "NameN": "يمني"
+  },
+  {
+    "ID": "ZMB",
+    "Name": "Zambian",
+    "NameN": "زامبي"
+  },
+  {
+    "ID": "ZWE",
+    "Name": "Zimbabwean",
+    "NameN": "زيمبابوي"
+  }
+]
\ No newline at end of file
diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json
index 64477a3..df18bfd 100644
--- a/assets/langs/ar-SA.json
+++ b/assets/langs/ar-SA.json
@@ -186,7 +186,6 @@
   "middleName": "اسم الأب",
   "lastName": "اسم العائلة",
   "female": "أنثى",
-  "male": "ذكر",
   "preferredLanguage": "اللغة المفضلة *",
   "locationsRegister": "أين ترغب في إنشاء هذا الملف؟",
   "ksa": "السعودية",
@@ -790,5 +789,9 @@
   "notice": "إشعار",
   "oR": "أو",
   "sendOTPWHATSAPP": "أرسل لي OTP عبر واتساب",
-  "sendOTPSMS": "أرسل لي OTP عبر الرسائل القصيرة"
+  "sendOTPSMS": "أرسل لي OTP عبر الرسائل القصيرة",
+  "fullName": "الاسم الكامل",
+  "married": "متزوج",
+  "uae": "الإمارات العربية المتحدة",
+  "malE": "ذكر"
 }
\ No newline at end of file
diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json
index cd15a5a..c9493db 100644
--- a/assets/langs/en-US.json
+++ b/assets/langs/en-US.json
@@ -186,7 +186,6 @@
   "middleName": "Middle Name",
   "lastName": "Last Name",
   "female": "Female",
-  "male": "Male",
   "preferredLanguage": "Preferred Language *",
   "locationsRegister": "Where do you want to create this file?",
   "ksa": "KSA",
@@ -786,5 +785,9 @@
   "notice": "Notice",
   "oR": "OR",
   "sendOTPWHATSAPP": "Send me OTP on Whatsapp",
-  "sendOTPSMS": "Send me OTP on SMS"
+  "sendOTPSMS": "Send me OTP on SMS",
+  "fullName": "Full Name",
+  "married": "Married",
+  "uae" : "United Arab Emirates",
+  "malE": "Male"
 }
\ No newline at end of file
diff --git a/lib/core/common_models/nationality_country_model.dart b/lib/core/common_models/nationality_country_model.dart
new file mode 100644
index 0000000..fb3961b
--- /dev/null
+++ b/lib/core/common_models/nationality_country_model.dart
@@ -0,0 +1,29 @@
+import 'dart:convert';
+
+class NationalityCountries {
+  String? id;
+  String? name;
+  String? nameN;
+
+  NationalityCountries({
+    this.id,
+    this.name,
+    this.nameN,
+  });
+
+  factory NationalityCountries.fromRawJson(String str) => NationalityCountries.fromJson(json.decode(str));
+
+  String toRawJson() => json.encode(toJson());
+
+  factory NationalityCountries.fromJson(Map<String, dynamic> json) => NationalityCountries(
+    id: json["ID"],
+    name: json["Name"],
+    nameN: json["NameN"],
+  );
+
+  Map<String, dynamic> toJson() => {
+    "ID": id,
+    "Name": name,
+    "NameN": nameN,
+  };
+}
diff --git a/lib/extensions/string_extensions.dart b/lib/extensions/string_extensions.dart
index cbfac11..c9d6e39 100644
--- a/lib/extensions/string_extensions.dart
+++ b/lib/extensions/string_extensions.dart
@@ -435,3 +435,106 @@ extension CountryExtension on CountryEnum {
   }
 }
 
+
+extension GenderTypeExtension on GenderTypeEnum {
+  String get value => this == GenderTypeEnum.male ? "M" : "F";
+
+  String get type => this == GenderTypeEnum.male ? "Male" : "Female";
+
+  String get typeAr => this == GenderTypeEnum.male ? "ذكر" : "أنثى";
+
+  static GenderTypeEnum? fromValue(String? value) {
+    switch (value) {
+      case "M":
+        return GenderTypeEnum.male;
+      case "F":
+        return GenderTypeEnum.female;
+      default:
+        return null;
+    }
+  }
+
+  static GenderTypeEnum? fromType(String? type) {
+    switch (type) {
+      case "Male":
+        return GenderTypeEnum.male;
+      case "Female":
+        return GenderTypeEnum.female;
+      default:
+        return null;
+    }
+  }
+}
+
+extension MaritalStatusTypeExtension on MaritalStatusTypeEnum {
+  String get value {
+    switch (this) {
+      case MaritalStatusTypeEnum.single:
+        return "U";
+      case MaritalStatusTypeEnum.married:
+        return "M";
+      case MaritalStatusTypeEnum.divorced:
+        return "D";
+      case MaritalStatusTypeEnum.widowed:
+        return "W";
+    }
+  }
+
+  String get type {
+    switch (this) {
+      case MaritalStatusTypeEnum.single:
+        return "Single";
+      case MaritalStatusTypeEnum.married:
+        return "Married";
+      case MaritalStatusTypeEnum.divorced:
+        return "Divorced";
+      case MaritalStatusTypeEnum.widowed:
+        return "Widowed";
+    }
+  }
+
+  String get typeAr {
+    switch (this) {
+      case MaritalStatusTypeEnum.single:
+        return "أعزب";
+      case MaritalStatusTypeEnum.married:
+        return "متزوج";
+      case MaritalStatusTypeEnum.divorced:
+        return "مطلق";
+      case MaritalStatusTypeEnum.widowed:
+        return "أرمل";
+    }
+  }
+
+  static MaritalStatusTypeEnum? fromValue(String? value) {
+    switch (value) {
+      case "U":
+        return MaritalStatusTypeEnum.single;
+      case "M":
+        return MaritalStatusTypeEnum.married;
+      case "D":
+        return MaritalStatusTypeEnum.divorced;
+      case "W":
+        return MaritalStatusTypeEnum.widowed;
+      default:
+        return null;
+    }
+  }
+
+  static MaritalStatusTypeEnum? fromType(String? type) {
+    switch (type) {
+      case "Single":
+        return MaritalStatusTypeEnum.single;
+      case "Married":
+        return MaritalStatusTypeEnum.married;
+      case "Divorced":
+        return MaritalStatusTypeEnum.divorced;
+      case "Widowed":
+        return MaritalStatusTypeEnum.widowed;
+      default:
+        return null;
+    }
+  }
+}
+
+
diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart
index c5f2592..881e730 100644
--- a/lib/generated/locale_keys.g.dart
+++ b/lib/generated/locale_keys.g.dart
@@ -789,5 +789,9 @@ abstract class  LocaleKeys {
   static const oR = 'oR';
   static const sendOTPWHATSAPP = 'sendOTPWHATSAPP';
   static const sendOTPSMS = 'sendOTPSMS';
+  static const fullName = 'fullName';
+  static const married = 'married';
+  static const uae = 'uae';
+  static const malE = 'malE';
 
 }
diff --git a/lib/presentation/authentication/register.dart b/lib/presentation/authentication/register.dart
index b445631..20c83f5 100644
--- a/lib/presentation/authentication/register.dart
+++ b/lib/presentation/authentication/register.dart
@@ -229,29 +229,30 @@ class _RegisterNew extends State<RegisterNew> {
                             MaterialPageRoute(builder: (BuildContext context) => OTPVerificationPage(phoneNumber: '12234567',)));
 
 
-                            // if (mobileNo.isEmpty) {
-                            //   context.showBottomSheet(
-                            //     child: ExceptionBottomSheet(
-                            //       message: TranslationBase.of(context).pleaseEnterMobile,
-                            //       showCancel: false,
-                            //       onOkPressed: () {
-                            //         Navigator.of(context).pop();
-                            //       },
-                            //     ),
-                            //   );
-                            // } else if (!Utils.validateMobileNumber(mobileNo)) {
-                            //   context.showBottomSheet(
-                            //     child: ExceptionBottomSheet(
-                            //       message: TranslationBase.of(context).pleaseEnterValidMobile,
-                            //       showCancel: false,
-                            //       onOkPressed: () {
-                            //         Navigator.of(context).pop();
-                            //       },
-                            //     ),
-                            //   );
-                            // } else {
-                            //   registerUser(1);
-                            // }
+                        // if (mobileNo.isEmpty) {
+                        //   context.showBottomSheet(
+                        //     child: ExceptionBottomSheet(
+                        //       message: TranslationBase.of(context).pleaseEnterMobile,
+                        //       showCancel: false,
+                        //       onOkPressed: () {
+                        //         Navigator.of(context).pop();
+                        //       },
+                        //     ),
+                        //   );
+                        // } else if (!Utils.validateMobileNumber(mobileNo)) {
+                        //   context.showBottomSheet(
+                        //     child: ExceptionBottomSheet(
+                        //       message: TranslationBase.of(context).pleaseEnterValidMobile,
+                        //       showCancel: false,
+                        //       onOkPressed: () {
+                        //         Navigator.of(context).pop();
+                        //       },
+                        //     ),
+                        //   );
+                        // } else {
+                        //   registerUser(1);
+                        // }
+                        Navigator.of(context).push(MaterialPageRoute(builder: (BuildContext context) => OTPVerificationPage(phoneNumber: '12234567')));
                             },
                       backgroundColor: AppColors.primaryRedColor,
                       borderColor: AppColors.primaryRedBorderColor,
diff --git a/lib/presentation/authentication/register_step2.dart b/lib/presentation/authentication/register_step2.dart
new file mode 100644
index 0000000..dbffe91
--- /dev/null
+++ b/lib/presentation/authentication/register_step2.dart
@@ -0,0 +1,311 @@
+import 'dart:convert';
+
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hmg_patient_app_new/core/app_assets.dart';
+import 'package:hmg_patient_app_new/core/app_state.dart';
+import 'package:hmg_patient_app_new/core/common_models/nationality_country_model.dart';
+import 'package:hmg_patient_app_new/core/dependencies.dart';
+import 'package:hmg_patient_app_new/core/enums.dart';
+import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
+import 'package:hmg_patient_app_new/extensions/context_extensions.dart';
+import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
+import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
+import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
+import 'package:hmg_patient_app_new/theme/colors.dart';
+import 'package:hmg_patient_app_new/widgets/appbar/app_bar_widget.dart';
+import 'package:hmg_patient_app_new/widgets/bottomsheet/generic_bottom_sheet.dart';
+import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
+import 'package:hmg_patient_app_new/widgets/dropdown/dropdown_widget.dart';
+import 'package:hmg_patient_app_new/widgets/input_widget.dart';
+
+class RegisterNewStep2 extends StatefulWidget {
+  var nHICData;
+  var payload;
+
+  RegisterNewStep2(this.nHICData, this.payload, {Key? key}) : super(key: key);
+
+  @override
+  _RegisterNew createState() => _RegisterNew();
+}
+
+class _RegisterNew extends State<RegisterNewStep2> {
+  bool isFromDubai = true;
+  List<NationalityCountries> countriesList = [];
+  AppState? appState;
+  GenderTypeEnum? selectedGenderType;
+  MaritalStatusTypeEnum? selectedMaritalStatusType;
+  CountryEnum? selectedCountry;
+
+  @override
+  void initState() {
+    super.initState();
+    // isFromDubai = widget.payload.zipCode!.contains("971") || widget.payload.zipCode!.contains("+971");
+    loadCountriesList();
+  }
+
+  loadCountriesList() async {
+    appState = getIt.get<AppState>();
+    final String response = await DefaultAssetBundle.of(context).loadString('assets/json/countriesList.json');
+    final List<dynamic> data = json.decode(response);
+    countriesList = data.map((e) => NationalityCountries.fromJson(e)).toList();
+  }
+
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: CustomAppBar(onBackPressed: () {}, onLanguageChanged: (lang) {}, hideLogoAndLang: true,),
+      body: SingleChildScrollView(
+        reverse: false,
+        padding: EdgeInsets.only(left: 24.h, right: 24.h, top: 24.h),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: <Widget>[
+            Directionality(
+              textDirection: Directionality.of(context),
+              child: Container(
+                decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(24)),
+                padding: EdgeInsets.only(left: 16.h, right: 16.h),
+                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,
+                        isEnable: true,
+                        prefix: null,
+                        isAllowRadius: false,
+                        isBorderAllowed: false,
+                        keyboardType: TextInputType.text,
+                        isAllowLeadingIcon: true,
+                        isReadOnly: isFromDubai ? false : true,
+                        leadingIcon: AppAssets.user_circle),
+                    Divider(height: 1),
+                    TextInputWidget(
+                        labelText: LocaleKeys.nationalIdNumber.tr(),
+                        hintText: isFromDubai ? "widget.payload.nationalID!" : (widget.nHICData!.idNumber ?? ""),
+                        controller: null,
+                        isEnable: true,
+                        prefix: null,
+                        isAllowRadius: false,
+                        isBorderAllowed: false,
+                        isAllowLeadingIcon: true,
+                        isReadOnly: true,
+                        leadingIcon: AppAssets.student_card),
+                    Divider(height: 1),
+                    isFromDubai
+                        ? DropdownWidget(
+                            labelText: LocaleKeys.gender.tr(),
+                            hintText: LocaleKeys.malE.tr(),
+                            isEnable: true,
+                            dropdownItems: GenderTypeEnum.values.map((e) => appState!.isArabic() ? e.typeAr : e.type).toList(),
+                            selectedValue: appState!.isArabic() ? selectedGenderType!.typeAr : selectedGenderType?.type,
+                            // selectionType: SelectionType.dropdown,
+                            onChange: (val) {
+                              if (val != null) {}
+                            },
+                            isBorderAllowed: false,
+                            hasSelectionCustomIcon: true,
+                            isAllowRadius: false,
+                            padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0),
+                            selectionCustomIcon: AppAssets.arrow_down,
+                            // leadingIcon: 'assets/images/svg/user-full.svg',
+                          ).withVerticalPadding(8)
+                        : TextInputWidget(
+                            labelText: LocaleKeys.gender.tr(),
+                            hintText: (widget.nHICData!.gender ?? ""),
+                            controller: null,
+                            isEnable: true,
+                            prefix: null,
+                            isAllowRadius: false,
+                            isBorderAllowed: false,
+                            isAllowLeadingIcon: true,
+                            isReadOnly: isFromDubai ? false : true,
+                            leadingIcon: AppAssets.user_full,
+                            onChange: (value) {}),
+                    Divider(height: 1),
+                    isFromDubai
+                        ? DropdownWidget(
+                            labelText: LocaleKeys.maritalStatus.tr(),
+                            hintText: LocaleKeys.married.tr(),
+                            isEnable: true,
+                            dropdownItems: MaritalStatusTypeEnum.values.map((e) => appState!.isArabic() ? e.typeAr : e.type).toList(),
+                            selectedValue: appState!.isArabic() ? selectedMaritalStatusType!.typeAr : selectedMaritalStatusType?.type,
+                            onChange: (val) {},
+                            isBorderAllowed: false,
+                            hasSelectionCustomIcon: true,
+                            isAllowRadius: false,
+                            padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0),
+                            selectionCustomIcon: AppAssets.arrow_down,
+                            // leadingIcon: 'assets/images/svg/smart-phone.svg',
+                          ).withVerticalPadding(8)
+                        : TextInputWidget(
+                            labelText: LocaleKeys.maritalStatus.tr(),
+                            hintText: appState!.isArabic()
+                                ? (MaritalStatusTypeExtension.fromValue(widget.nHICData!.maritalStatusCode)!.typeAr)
+                                : (MaritalStatusTypeExtension.fromValue(widget.nHICData!.maritalStatusCode)!.type),
+                            isEnable: true,
+                            prefix: null,
+                            isAllowRadius: false,
+                            isBorderAllowed: false,
+                            isAllowLeadingIcon: true,
+                            isReadOnly: true,
+                            leadingIcon: AppAssets.smart_phone,
+                            onChange: (value) {}),
+                    Divider(height: 1),
+                    isFromDubai
+                        ? DropdownWidget(
+                            labelText: LocaleKeys.country.tr(),
+                            hintText: LocaleKeys.uae.tr(),
+                            isEnable: true,
+                            dropdownItems: countriesList.map((e) => appState!.isArabic() ? e.nameN ?? "" : e.name ?? "").toList(),
+                            selectedValue: appState!.isArabic() ? selectedCountry!.nameArabic ?? "" : selectedCountry?.name ?? "",
+                            onChange: (val) {},
+                            isBorderAllowed: false,
+                            hasSelectionCustomIcon: true,
+                            isAllowRadius: false,
+                            padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0),
+                            selectionCustomIcon: AppAssets.arrow_down,
+                            // leadingIcon: 'assets/images/svg/globe.svg',
+                          ).withVerticalPadding(8)
+                        : TextInputWidget(
+                            labelText: LocaleKeys.nationality.tr(),
+                            hintText: appState!.isArabic()
+                                ? (countriesList.firstWhere((e) => e.id == (widget.nHICData!.nationalityCode ?? ""), orElse: () => NationalityCountries()).nameN ?? "")
+                                : (countriesList.firstWhere((e) => e.id == (widget.nHICData!.nationalityCode ?? ""), orElse: () => NationalityCountries()).name ?? ""),
+                            isEnable: true,
+                            prefix: null,
+                            isAllowRadius: false,
+                            isBorderAllowed: false,
+                            isAllowLeadingIcon: true,
+                            isReadOnly: true,
+                            leadingIcon: AppAssets.globe,
+                            onChange: (value) {}),
+                    Divider(height: 1),
+                    TextInputWidget(
+                        labelText: LocaleKeys.mobileNumber.tr(),
+                        hintText: ("widget.payload.mobileNo" ?? ""),
+                        controller: null,
+                        isEnable: true,
+                        prefix: null,
+                        isAllowRadius: false,
+                        isBorderAllowed: false,
+                        isAllowLeadingIcon: true,
+                        isReadOnly: true,
+                        leadingIcon: AppAssets.call,
+                        onChange: (value) {}),
+                    Divider(height: 1),
+                    TextInputWidget(
+                        labelText: LocaleKeys.dob.tr(),
+                        hintText: isFromDubai ? "widget.payload.dob!" : (widget.nHICData!.dateOfBirth ?? ""),
+                        controller: null,
+                        isEnable: true,
+                        prefix: null,
+                        isBorderAllowed: false,
+                        isAllowLeadingIcon: true,
+                        isReadOnly: true,
+                        // selectionType: SelectionType.calendar,
+                        // selectedValue: widget.payload.dob != null ? Utils.formatDateToDisplay(widget.payload.dob.toString()) : null,
+                        // selectionCustomIcon: AppAssets.calendar,
+                        // leadingIcon: AppAssets.birthday_cake,
+                        onChange: (value) {}),
+                  ],
+                ),
+              ),
+            ),
+            SizedBox(height: 50.h),
+            Row(
+              children: [
+                Expanded(
+                  child: CustomButton(
+                    text: LocaleKeys.cancel,
+                    icon: AppAssets.cancel,
+                    onPressed: () {
+                      Navigator.of(context).pop();
+                    },
+                    // fontFamily: context.fontFamily,
+                    backgroundColor: AppColors.secondaryLightRedColor,
+                    borderColor: AppColors.secondaryLightRedColor,
+                    textColor: AppColors.primaryRedColor,
+                    iconColor: AppColors.primaryRedColor,
+                  ),
+                ),
+                SizedBox(
+                  width: 16,
+                ),
+                Expanded(
+                  child: CustomButton(
+                    backgroundColor: AppColors.lightGreenColor,
+                    borderColor: AppColors.lightGreenColor,
+                    textColor: AppColors.textGreenColor,
+                    text: LocaleKeys.confirm.tr(),
+                    icon: AppAssets.confirm,
+                    iconColor: AppColors.textGreenColor,
+                    onPressed: () {
+                      // if (isFromDubai) {
+                      //   if (name == null) {
+                      //     AppToast.showErrorToast(message: LocaleKeys.enterFullName);
+                      //     return;
+                      //   }
+                      //   if (!name!.contains(" ")) if (selectedGenderType == null) {
+                      //     AppToast.showErrorToast(message: TranslationBase.of(context).enterFullName);
+                      //     return;
+                      //   }
+                      //   if (selectedMaritalStatusType == null) {
+                      //     AppToast.showErrorToast(message: TranslationBase.of(context).chooseMaritalStatus);
+                      //     return;
+                      //   }
+                      //   if (selectedCountry == null) {
+                      //     AppToast.showErrorToast(message: TranslationBase.of(context).chooseCountry);
+                      //     return;
+                      //   }
+                      // }
+
+                      showModel(context: context);
+                    },
+                  ),
+                )
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  void showModel({required BuildContext context}) {
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      isDismissible: false,
+      backgroundColor: Colors.transparent,
+      builder: (bottomSheetContext) => Padding(
+        padding: EdgeInsets.only(bottom: MediaQuery.of(bottomSheetContext).viewInsets.bottom),
+        child: SingleChildScrollView(
+          child: GenericBottomSheet(
+            textController: TextEditingController(),
+            isForEmail: true,
+            buttons: [
+              Padding(
+                padding: const EdgeInsets.only(bottom: 10),
+                child: CustomButton(
+                    text: LocaleKeys.submit,
+                    onPressed: () {
+                      // if (emailAddress.text.isEmpty) {
+                      //   Utils.showErrorToast(TranslationBase.of(context).enterEmailAddress);
+                      //   return;
+                      // } else {
+                      //   Navigator.of(context).pop();
+                      //   registerNow();
+                      // }
+                    },
+                    backgroundColor: AppColors.bgGreenColor,
+                    borderColor: AppColors.bgGreenColor,
+                    textColor: AppColors.whiteColor),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/home/landing_page.dart b/lib/presentation/home/landing_page.dart
index c305110..60161f0 100644
--- a/lib/presentation/home/landing_page.dart
+++ b/lib/presentation/home/landing_page.dart
@@ -49,7 +49,8 @@ class _LandingPageState extends State<LandingPage> {
                     CustomButton(
                       text: LocaleKeys.loginOrRegister.tr(context: context),
                       onPressed: () async {
-                        await authenticationViewModel.selectDeviceImei();
+                        // await authenticationViewModel.selectDeviceImei();
+                        Navigator.of(context).push(MaterialPageRoute(builder: (BuildContext context) => LoginScreen()));
                       },
                       backgroundColor: Color(0xffFEE9EA),
                       borderColor: Color(0xffFEE9EA),
diff --git a/lib/theme/colors.dart b/lib/theme/colors.dart
index a395ba3..4b2d69b 100644
--- a/lib/theme/colors.dart
+++ b/lib/theme/colors.dart
@@ -35,6 +35,10 @@ class AppColors {
   static const blackColor = textColor;
   static const inputLabelTextColor = Color(0xff898A8D);
 
+
+  static const lightGreenColor = Color(0xFF0ccedde);
+  static const textGreenColor = Color(0xFF18C273);
+
   //Chips
   static const Color successColor = Color(0xff18C273);
   static const Color errorColor = Color(0xFFED1C2B);
diff --git a/lib/widgets/otp/otp.dart b/lib/widgets/otp/otp.dart
index 5cfd3e9..81c375b 100644
--- a/lib/widgets/otp/otp.dart
+++ b/lib/widgets/otp/otp.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
+import 'package:hmg_patient_app_new/presentation/authentication/register_step2.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/appbar/app_bar_widget.dart';
 
@@ -208,6 +209,8 @@ class _OTPVerificationPageState extends State<OTPVerificationPage> {
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(content: Text('Verifying OTP: $otp')),
     );
+
+    Navigator.of(context).push(MaterialPageRoute(builder: (BuildContext context) => RegisterNewStep2(null, {"nationalID": "12345678654321"})));
   }
 
   /// Auto fill OTP into text fields
diff --git a/pubspec.yaml b/pubspec.yaml
index 4c2b81f..22a33d1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -81,6 +81,7 @@ flutter:
     - assets/
     - assets/fonts/
     - assets/langs/
+    - assets/json/
     - assets/images/
     - assets/images/svg/
     - assets/images/png/