fixes

lib/core/service/AlHabibMedicalService/e_referral_service.dart

@@ -117,8 +117,6 @@ class EReferralService extends BaseService {
     _allReferral.clear();
     hasError = false;
 
-    searchEReferralRequestModel.patientMobileNumber = "966545156035";
-
     // TODO return this code when the fix the server
     await baseAppClient.post(GET_E_REFERRALS,
         onSuccess: (dynamic response, int statusCode) {

lib/models/Appointments/AppoimentAllHistoryResultList.dart

@@ -39,7 +39,7 @@ class AppoitmentAllHistoryResultList {
   String doctorImageURL;
   String doctorNameObj;
   int doctorRate;
-  double decimalDoctorRate;
+  dynamic decimalDoctorRate;
   List<String> doctorSpeciality;
   String doctorTitle;
   int gender;

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

@@ -1,5 +1,6 @@
 import 'dart:ui';
 
+import 'package:diplomaticquarterapp/config/config.dart';
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/config/size_config.dart';
 import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
@@ -34,7 +35,6 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:diplomaticquarterapp/config/config.dart';
 
 class MyFamily extends StatefulWidget {
   final bool isAppbarVisible;
@@ -192,24 +192,40 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
                                             Row(
                                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                               children: [
-                                                Row(
-                                                  children: [
-                                                    CupertinoSwitch(
-                                                      value: isSwitchUser,
-                                                      onChanged: (value) {
-                                                        setState(() {
-                                                          isSwitchUser = value;
-                                                        });
-                                                        if (isSwitchUser == true) switchUser(snapshot.data.getAllSharedRecordsByStatusList[index], context);
-                                                      },
-                                                    ),
-                                                    Texts(
-                                                      TranslationBase.of(context).switchUser,
-                                                      color: Colors.white,
-                                                      fontSize: 12,
-                                                    )
-                                                  ],
+                                                Container(
+                                                  margin: EdgeInsets.only(top: 5.0),
+                                                  width: 100.0,
+                                                  child: DefaultButton(
+                                                    TranslationBase.of(context).switchUser,
+                                                    () {
+                                                      // setState(() {
+                                                      //   isSwitchUser = value;
+                                                      // });
+                                                      switchUser(snapshot.data.getAllSharedRecordsByStatusList[index], AppGlobal.context);
+                                                    },
+                                                    fontSize: 12.0,
+                                                    color: Colors.white,
+                                                    textColor: Colors.black,
+                                                  ),
                                                 ),
+                                                // Row(
+                                                //   children: [
+                                                //     CupertinoSwitch(
+                                                //       value: isSwitchUser,
+                                                //       onChanged: (value) {
+                                                //         setState(() {
+                                                //           isSwitchUser = value;
+                                                //         });
+                                                //         if (isSwitchUser == true) switchUser(snapshot.data.getAllSharedRecordsByStatusList[index], context);
+                                                //       },
+                                                //     ),
+                                                //     Texts(
+                                                //       TranslationBase.of(context).switchUser,
+                                                //       color: Colors.white,
+                                                //       fontSize: 12,
+                                                //     )
+                                                //   ],
+                                                // ),
                                                 InkWell(
                                                     onTap: () {
                                                       deleteFamily(snapshot.data.getAllSharedRecordsByStatusList[index], context);

lib/pages/MyAppointments/MyAppointments.dart

@@ -167,7 +167,6 @@ class _MyAppointmentsState extends State<MyAppointments> with SingleTickerProvid
       GifLoaderDialogUtils.hideDialog(context);
       print(err);
       AppToast.showErrorToast(message: err);
-      Navigator.of(context).pop();
     });
   }
 

lib/widgets/buttons/defaultButton.dart

@@ -7,7 +7,8 @@ class DefaultButton extends StatelessWidget {
   final Color color;
   final Color disabledColor;
   final IconData iconData;
-  DefaultButton(this.text, this.onPress, {this.color, this.disabledColor, this.textColor = Colors.white, this.iconData});
+  final double fontSize;
+  DefaultButton(this.text, this.onPress, {this.color, this.disabledColor, this.textColor = Colors.white, this.iconData, this.fontSize});
 
   @override
   Widget build(BuildContext context) {
@@ -23,7 +24,7 @@ class DefaultButton extends StatelessWidget {
               child: Text(
                 text,
                 textAlign: TextAlign.center,
-                style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: textColor, letterSpacing: -0.48),
+                style: TextStyle(fontSize: fontSize ?? 16, fontWeight: FontWeight.w600, color: textColor, letterSpacing: -0.48),
               ),
             ),
           ],