Merge branch 'development_new_design_2.0' into haroon-new-design

lib/config/config.dart

@@ -12,8 +12,8 @@ const PACKAGES_PRODUCTS = '/api/products';
 const PACKAGES_CUSTOMER = '/api/customers';
 const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
 const PACKAGES_ORDERS = '/api/orders';
-const BASE_URL = 'https://uat.hmgwebservices.com/';
-// const BASE_URL = 'https://hmgwebservices.com/';
+// const BASE_URL = 'https://uat.hmgwebservices.com/';
+const BASE_URL = 'https://hmgwebservices.com/';
 
 // Pharmacy UAT URLs
 // const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
@@ -438,7 +438,6 @@ const PHARMACY_MAKE_REVIEW = 'epharmacy/api/insertreviews';
 const BLOOD_DONATION_REGISTER_BLOOD_TYPE = 'Services/PatientVarification.svc/REST/BloodDonation_RegisterBloodType';
 const ADD_USER_AGREEMENT_FOR_BLOOD_DONATION = 'Services/PatientVarification.svc/REST/AddUserAgreementForBloodDonation';
 
-
 // CMC RC SERVICES
 const GET_ALL_CMC_SERVICES_RC = 'rc/api/cmc/getallcmc';
 const ADD_CMC_ORDER_RC = 'rc/api/cmc/add';

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

@@ -562,7 +562,8 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
     this.sharedPref.setObject(FAMILY_FILE, familyFile);
     this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID);
     this.sharedPref.setString(TOKEN, result.authenticationTokenID);
-
+    _vitalSignService.heightCm = "";
+    _vitalSignService.weightKg = "";
     await authenticatedUserObject.getUser(getUser: true);
     Provider.of<ProjectViewModel>(AppGlobal.context, listen: false).user = authenticatedUserObject.user;
     Provider.of<ProjectViewModel>(AppGlobal.context, listen: false).setUser(authenticatedUserObject.user);