BASE: Update Firebase Json File.

android/app/google-services.json

@@ -8,7 +8,43 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:893074789710:android:05002c15a64cf1e0c4ba1f",
+        "mobilesdk_app_id": "1:893074789710:android:70c2e98114a8ef1ac4ba1f",
+        "android_client_info": {
+          "package_name": "felix.fondex.driver"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "893074789710-nqkeis20f6b64luas7g44c836fvi0qms.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyALZhdy7Rw3jffipxsDvvz7_C_b4teVg1k"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "893074789710-nqkeis20f6b64luas7g44c836fvi0qms.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "893074789710-7am77oq925d324gvpga8g6r6ggul4v9i.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "com.emart.driver"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:893074789710:android:e932bc88da6665b3c4ba1f",
         "android_client_info": {
           "package_name": "felix.fondex.uz"
         }
@@ -32,10 +68,10 @@
               "client_type": 3
             },
             {
-              "client_id": "893074789710-pv12m4nhe82a4ueg9sb2pgt42r0e5da3.apps.googleusercontent.com",
+              "client_id": "893074789710-7am77oq925d324gvpga8g6r6ggul4v9i.apps.googleusercontent.com",
               "client_type": 2,
               "ios_info": {
-                "bundle_id": "felix.fondex.uz"
+                "bundle_id": "com.emart.driver"
               }
             }
           ]

firebase.json

@@ -1 +1 @@
-{"flutter":{"platforms":{"android":{"default":{"projectId":"fondexuzb","appId":"1:893074789710:android:05002c15a64cf1e0c4ba1f","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"fondexuzb","configurations":{"android":"1:893074789710:android:05002c15a64cf1e0c4ba1f","ios":"1:893074789710:ios:510ebf9e4ebed6a8c4ba1f"}}},"ios":{"default":{"projectId":"fondexuzb","appId":"1:893074789710:ios:510ebf9e4ebed6a8c4ba1f","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}}}}}
+{"flutter":{"platforms":{"android":{"default":{"projectId":"fondexuzb","appId":"1:893074789710:android:e932bc88da6665b3c4ba1f","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"fondexuzb","configurations":{"android":"1:893074789710:android:e932bc88da6665b3c4ba1f","ios":"1:893074789710:ios:7dd456b65070f325c4ba1f"}}},"ios":{"default":{"projectId":"fondexuzb","appId":"1:893074789710:ios:7dd456b65070f325c4ba1f","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}}}}}

ios/Runner/GoogleService-Info.plist

@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>CLIENT_ID</key>
-	<string>893074789710-pv12m4nhe82a4ueg9sb2pgt42r0e5da3.apps.googleusercontent.com</string>
+	<string>893074789710-tgc677brhj8902uu2nv6k53otbhbnp1e.apps.googleusercontent.com</string>
 	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.893074789710-pv12m4nhe82a4ueg9sb2pgt42r0e5da3</string>
+	<string>com.googleusercontent.apps.893074789710-tgc677brhj8902uu2nv6k53otbhbnp1e</string>
 	<key>API_KEY</key>
 	<string>AIzaSyD6Khoz4y93GCj3mOPi2FoluDipplH1av0</string>
 	<key>GCM_SENDER_ID</key>
@@ -13,7 +13,7 @@
 	<key>PLIST_VERSION</key>
 	<string>1</string>
 	<key>BUNDLE_ID</key>
-	<string>felix.fondex.uz</string>
+	<string>uz.felix.fondex.customer</string>
 	<key>PROJECT_ID</key>
 	<string>fondexuzb</string>
 	<key>STORAGE_BUCKET</key>
@@ -29,7 +29,7 @@
 	<key>IS_SIGNIN_ENABLED</key>
 	<true></true>
 	<key>GOOGLE_APP_ID</key>
-	<string>1:893074789710:ios:510ebf9e4ebed6a8c4ba1f</string>
+	<string>1:893074789710:ios:7dd456b65070f325c4ba1f</string>
 	<key>DATABASE_URL</key>
 	<string>https://fondexuzb-default-rtdb.firebaseio.com</string>
 </dict>

lib/constant/const_texts.dart

@@ -152,12 +152,12 @@ class ConstTexts {
   static String favourites = "favourites";
   static String orders = "orders";
   static String takeAway = "takeAway";
-  static String allStores = "allStores";
+  // static String allStores = "allStores";
-  static String alert = "alert";
+  // static String alert = "alert";
-  static String cancel = "cancel";
+  // static String cancel = "cancel";
-  static String ok = "ok";
+  // static String ok = "ok";
-  static String freeDelivery = "freeDelivery";
+  // static String freeDelivery = "freeDelivery";
-  static String upto = "upto";
+  // static String upto = "upto";
-  static String doYouWantChangeTheDeliverOption = "doYouWantChangeTheDeliverOption";
+  // static String doYouWantChangeTheDeliverOption = "doYouWantChangeTheDeliverOption";
-  static String cash = "cash";
+  // static String cash = "cash";
 }

lib/firebase_options.dart

@@ -51,7 +51,7 @@ class DefaultFirebaseOptions {
 
   static const FirebaseOptions android = FirebaseOptions(
     apiKey: 'AIzaSyALZhdy7Rw3jffipxsDvvz7_C_b4teVg1k',
-    appId: '1:893074789710:android:05002c15a64cf1e0c4ba1f',
+    appId: '1:893074789710:android:e932bc88da6665b3c4ba1f',
     messagingSenderId: '893074789710',
     projectId: 'fondexuzb',
     databaseURL: 'https://fondexuzb-default-rtdb.firebaseio.com',
@@ -60,13 +60,13 @@ class DefaultFirebaseOptions {
 
   static const FirebaseOptions ios = FirebaseOptions(
     apiKey: 'AIzaSyD6Khoz4y93GCj3mOPi2FoluDipplH1av0',
-    appId: '1:893074789710:ios:510ebf9e4ebed6a8c4ba1f',
+    appId: '1:893074789710:ios:7dd456b65070f325c4ba1f',
     messagingSenderId: '893074789710',
     projectId: 'fondexuzb',
     databaseURL: 'https://fondexuzb-default-rtdb.firebaseio.com',
     storageBucket: 'fondexuzb.firebasestorage.app',
-    iosClientId:
+    iosClientId: '893074789710-tgc677brhj8902uu2nv6k53otbhbnp1e.apps.googleusercontent.com',
-        '893074789710-pv12m4nhe82a4ueg9sb2pgt42r0e5da3.apps.googleusercontent.com',
+    iosBundleId: 'uz.felix.fondex.customer',
-    iosBundleId: 'felix.fondex.uz',
   );
-}
+
+}

lib/screen_ui/multi_vendor_service/home_screen/home_screen.dart

@@ -1248,9 +1248,9 @@ class HomeScreen extends StatelessWidget {
                             builder: (BuildContext context) {
                               return CustomDialogBox(
                                 title: ConstTexts.alert.tr,
-                                descriptions:
+                                descriptions:"",
-                                    ConstTexts.doYouWantChangeTheDeliverOption
+                                    // ConstTexts.doYouWantChangeTheDeliverOption
-                                        .tr,
+                                    //     .tr,
                                 positiveString: ConstTexts.ok.tr,
                                 negativeString: ConstTexts.cancel.tr,
                                 positiveClick: () async {