Family members issue fixed in android

lib/config/config.dart

@@ -22,8 +22,8 @@ var PACKAGES_ORDER_HISTORY = '/api/orders/items';
 var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
 // var  BASE_URL = 'http://10.50.100.198:2018/';
 // var  BASE_URL = 'http://10.50.100.198:4422/';
-var BASE_URL = 'https://uat.hmgwebservices.com/';
-// var BASE_URL = 'https://hmgwebservices.com/';
+// var BASE_URL = 'https://uat.hmgwebservices.com/';
+var BASE_URL = 'https://hmgwebservices.com/';
 //  var  BASE_URL = 'http://10.20.200.111:1010/';
 // var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
 // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';

lib/pages/DrawerPages/family/my-family.dart

@@ -476,7 +476,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
     var mainUser = await sharedPref.getObject(MAIN_USER);
     var loginType = await sharedPref.getInt(LAST_LOGIN);
     var pushToken = await sharedPref.getString(PUSH_TOKEN);
-    var oneSignalPushToken = await sharedPref.getString(ONESIGNAL_APNS_TOKEN);
+    // var oneSignalPushToken = await sharedPref.getString(ONESIGNAL_APNS_TOKEN ?? "");
     this.sharedPref.clear();
     if (mainUser["PatientID"] != result.list.patientID) {
       result.list.isFamily = true;
@@ -484,7 +484,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
     this.sharedPref.setString(APP_LANGUAGE, currentLang);
     this.sharedPref.setString(BLOOD_TYPE, bloodType);
     this.sharedPref.setString(PUSH_TOKEN, pushToken);
-    this.sharedPref.setString(ONESIGNAL_APNS_TOKEN, oneSignalPushToken);
+    // this.sharedPref.setString(ONESIGNAL_APNS_TOKEN, oneSignalPushToken);
     this.sharedPref.setInt(LAST_LOGIN, loginType ?? 1);
     await this.sharedPref.setObject(MAIN_USER, mainUser);
     await this.sharedPref.setObject(USER_PROFILE, result.list);
@@ -497,6 +497,8 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
     Provider.of<ProjectViewModel>(context, listen: false).setUser(result.list);
     Provider.of<ProjectViewModel>(context, listen: false).authenticatedUserObject.user = result.list;
 
+    await this.sharedPref.remove(APPOINTMENT_HISTORY_MEDICAL);
+
     try {
       // await appointmentRateViewModel.getIsLastAppointmentRatedList();
       await getToDoCount();

lib/pages/medical/radiology/radiology_details_page.dart

@@ -56,7 +56,7 @@ class RadiologyDetailsPage extends StatelessWidget {
                   finalRadiology!.projectName!,
                   finalRadiology!.orderDate,
                   null,
-                  finalRadiology!.nationalityFlagURL!,
+                  finalRadiology!.nationalityFlagURL ?? "",
                   finalRadiology!.doctorRate,
                   finalRadiology!.actualDoctorRate,
                   finalRadiology!.noOfPatientsRate,

lib/widgets/new_design/doctor_header.dart

@@ -107,7 +107,7 @@ class DoctorHeader extends StatelessWidget {
                     if (headerModel.nationalityFlagURL != null)
                       Padding(
                         padding: const EdgeInsets.only(top: 8.0),
-                        child: headerModel.nationalityFlagURL.isNotEmpty && headerModel.nationalityFlagURL != null &&  headerModel.nationalityFlagURL != 'null'? Image.network(headerModel.nationalityFlagURL, height: 20) : SizedBox(),
+                        child: headerModel.nationalityFlagURL.isNotEmpty && headerModel.nationalityFlagURL != null && headerModel.nationalityFlagURL != 'null'? Image.network(headerModel.nationalityFlagURL, height: 20) : SizedBox(),
                       ),
                   ],
                 )