bump-v to 1.0.31+0.

Merge branch 'dev' of https://github.com/SyncrowIOT/syncrow-app into release-to-stores
Update Firebase URLs for development, production, and staging environments in GoogleService-Info.plist and google-services.json files.
2026-03-11 08:51:44 +00:00 · 2025-07-13 13:27:50 +03:00 · 2025-07-13 13:02:57 +03:00 · 2025-07-13 12:48:17 +03:00 · 2025-07-13 12:37:53 +03:00 · 2025-07-13 11:49:58 +03:00
108 changed files with 2550 additions and 1194 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -36,11 +36,11 @@
       
              "--flavor",
              
-              "prod",
+              "staging",

              "-t",
  
-              "lib/main.dart"
+              "lib/main_staging.dart"
       
            ],
       
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -26,9 +26,15 @@ if (flutterVersionName == null) {
    flutterVersionName = '1.0'
 }

+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
-    namespace "com.example.syncrow_application"
-    compileSdkVersion 34
+    namespace "com.syncrow.mobile"
+    compileSdkVersion 35
    ndkVersion flutter.ndkVersion

    compileOptions {
@ -48,30 +54,44 @@ android {
    productFlavors {
        dev {
            dimension "env"
-            applicationId "com.example.syncrow_application"
+            applicationId "com.syncrow.mobile.dev"
+        }
+        staging {
+            dimension "env"
+            applicationId "com.syncrow.mobile.staging"
        }
        prod {
            dimension "env"
-            applicationId "com.example.syncrow_application"
+            applicationId "com.syncrow.mobile"
        }
    }

    defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.syncrow_application"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
+        applicationId "com.syncrow.mobile"
        minSdkVersion 21
        targetSdkVersion flutter.targetSdkVersion
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
    }

+    signingConfigs {
+        release {
+            if (keystorePropertiesFile.exists()) {
+                storeFile file(keystoreProperties['storeFile'])
+                storePassword keystoreProperties['storePassword']
+                keyAlias keystoreProperties['keyAlias']
+                keyPassword keystoreProperties['keyPassword']
+            }
+        }
+    }
+
    buildTypes {
        release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            if (keystorePropertiesFile.exists()) {
+                signingConfig signingConfigs.release
+            } else {
+                signingConfig signingConfigs.debug
+            }
        }
    }
 }
--- a/android/app/src/dev/google-services.json
+++ b/android/app/src/dev/google-services.json
@ -1,48 +1,30 @@
 {
-    "project_info": {
-      "project_number": "427332280600",
-      "project_id": "test2-8a3d2",
-      "storage_bucket": "test2-8a3d2.appspot.com"
-    },
-    "client": [
-      {
-        "client_info": {
-          "mobilesdk_app_id": "1:427332280600:android:550f67441246cb1a0c7e6d",
-          "android_client_info": {
-            "package_name": "com.example.syncrow_application"
-          }
-        },
-        "oauth_client": [],
-        "api_key": [
-          {
-            "current_key": "AIzaSyA5qOErxdm0zJmoHIB0TixfebYEsNRpwV0"
-          }
-        ],
-        "services": {
-          "appinvite_service": {
-            "other_platform_oauth_client": []
-          }
+  "project_info": {
+    "project_number": "255001682464",
+    "firebase_url": "https://syncrow-dev-79446.asia-southeast1.firebasedatabase.app",
+    "project_id": "syncrow-prod-79446",
+    "storage_bucket": "syncrow-prod-79446.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:255001682464:android:40e1d92346106850561245",
+        "android_client_info": {
+          "package_name": "com.syncrow.mobile.dev"
        }
      },
-      {
-        "client_info": {
-          "mobilesdk_app_id": "1:427332280600:android:bb6047adeeb80fb00c7e6d",
-          "android_client_info": {
-            "package_name": "com.example.syncrow_application"
-          }
-        },
-        "oauth_client": [],
-        "api_key": [
-          {
-            "current_key": "AIzaSyA5qOErxdm0zJmoHIB0TixfebYEsNRpwV0"
-          }
-        ],
-        "services": {
-          "appinvite_service": {
-            "other_platform_oauth_client": []
-          }
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyARJ5Wx2Uf8sbmb-AHB8WVfFwEFzrCIOKY"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
        }
      }
-    ],
-    "configuration_version": "1"
-  }
+    }
+  ],
+  "configuration_version": "1"
+}
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -9,12 +9,12 @@
    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>

    <application
-        android:label="syncrow_app"
+        android:label="SyncOS"
        android:name="${applicationName}"
        android:icon="@mipmap/ic_launcher"
        android:allowBackup="false">
        <activity
-            android:name=".MainActivity"
+            android:name="com.syncrow.mobile.MainActivity"
            android:exported="true"
            android:launchMode="singleTop"
            android:theme="@style/LaunchTheme"
--- a/android/app/src/main/kotlin/com/example/syncrow_app/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/example/syncrow_app/MainActivity.kt
@ -1,4 +1,4 @@
-package com.example.syncrow_application
+package com.syncrow.mobile

 import io.flutter.embedding.android.FlutterActivity

--- a/android/app/src/prod/google-services.json
+++ b/android/app/src/prod/google-services.json
@ -1,22 +1,22 @@
 {
  "project_info": {
-    "project_number": "786692570726",
-    "firebase_url": "https://syncrow-staging-default-rtdb.firebaseio.com",
-    "project_id": "syncrow-staging",
-    "storage_bucket": "syncrow-staging.appspot.com"
+    "project_number": "255001682464",
+    "firebase_url": "https://syncrow-prod-79446.asia-southeast1.firebasedatabase.app",
+    "project_id": "syncrow-prod-79446",
+    "storage_bucket": "syncrow-prod-79446.firebasestorage.app"
  },
  "client": [
    {
      "client_info": {
-        "mobilesdk_app_id": "1:786692570726:android:0ef7079c2b978d4417b7a7",
+        "mobilesdk_app_id": "1:255001682464:android:40e1d92346106850561245",
        "android_client_info": {
-          "package_name": "com.example.syncrow_application"
+          "package_name": "com.syncrow.mobile"
        }
      },
      "oauth_client": [],
      "api_key": [
        {
-          "current_key": "AIzaSyDP9GpYfLE8gHTj3kZ1hW8fx_FkJqOqSQk"
+          "current_key": "AIzaSyARJ5Wx2Uf8sbmb-AHB8WVfFwEFzrCIOKY"
        }
      ],
      "services": {
--- a/android/app/src/staging/google-services.json
+++ b/android/app/src/staging/google-services.json
@ -0,0 +1,30 @@
+{
+  "project_info": {
+    "project_number": "255001682464",
+    "firebase_url": "https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/",
+    "project_id": "syncrow-prod-79446",
+    "storage_bucket": "syncrow-prod-79446.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:255001682464:android:40e1d92346106850561245",
+        "android_client_info": {
+          "package_name": "com.syncrow.mobile.staging"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyARJ5Wx2Uf8sbmb-AHB8WVfFwEFzrCIOKY"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
--- a/assets/app-logo.png
+++ b/assets/app-logo.png
--- a/assets/icons/Booking.svg
+++ b/assets/icons/Booking.svg
@ -0,0 +1,12 @@
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_9795_16810)">
+<path d="M3.68007 14.1344H4.98041C5.73422 14.1344 5.73533 12.96 4.98041 12.96H3.68007C2.92629 12.96 2.92518 14.1344 3.68007 14.1344ZM3.68007 13.3994H4.98041C5.17143 13.3994 5.17143 13.695 4.98041 13.695H3.68007C3.48908 13.695 3.48908 13.3994 3.68007 13.3994Z" fill="white"/>
+<path d="M5.29431 7.55226L3.86289 8.9837L3.36716 8.48794C3.16621 8.28714 2.85552 8.59777 3.05641 8.79869L3.70753 9.44981C3.81112 9.53559 3.91472 9.53559 4.01828 9.44981L5.60509 7.86301C5.80595 7.66209 5.49525 7.35145 5.29431 7.55226Z" fill="white"/>
+<path d="M14.8368 9.72059C14.7481 9.55125 14.6838 9.36574 14.6401 9.17956C14.4259 8.28325 14.1003 7.41489 13.6727 6.59856L12.9576 5.23374C12.5529 4.46106 11.3583 4.58953 11.1328 5.437C10.5978 5.24455 9.99396 5.56087 9.84768 6.11024C9.40544 5.9511 8.89477 6.13855 8.6603 6.54527V1.7204V0.858486C8.66028 0.385137 8.27517 0 7.80176 0H2.68301C2.39892 0 2.39892 0.439453 2.68301 0.439453H7.80176C8.03282 0.439453 8.22082 0.627422 8.22082 0.858486V1.50067H0.439659V0.858486C0.439659 0.627422 0.627628 0.439453 0.858692 0.439453H1.45257C1.73666 0.439453 1.73666 0 1.45257 0H0.858692C0.385343 0 0.000205994 0.385137 0.000205994 0.858486V1.7204V12.3108V14.1415C0.000205994 14.6149 0.385343 15 0.858692 15H7.80176C8.27514 15 8.66027 14.6149 8.66027 14.1415V12.3108V11.4307L9.44546 11.819C9.63949 11.915 9.79896 12.0748 9.89452 12.269C10.2433 12.9779 11.1374 13.2717 11.8396 12.9038L13.1487 12.218C13.4004 12.0861 13.1965 11.6969 12.9448 11.8287L11.6357 12.5145C11.1494 12.7694 10.5312 12.5676 10.2888 12.075C10.1508 11.7945 9.92051 11.5637 9.64028 11.4251L6.30826 9.77698C5.68245 9.47303 6.13503 8.49126 6.7706 8.78769L7.98044 9.42457C8.16709 9.52283 8.3753 9.31506 8.27742 9.1282L6.17569 5.11652C5.83058 4.46771 6.75481 3.86883 7.10733 4.54184L8.59292 7.37742L8.98096 8.1181C9.10904 8.36271 9.50171 8.16518 9.37023 7.91417L8.99244 7.19309C8.83945 6.68329 9.46884 6.27226 9.87393 6.62766L10.2943 7.43004C10.4224 7.67464 10.8151 7.47712 10.6836 7.2261L10.2561 6.41024C10.2161 5.94152 10.7901 5.63988 11.153 5.94905L11.5761 6.75671C11.7042 7.00131 12.0968 6.80379 11.9653 6.55277L11.5421 5.745C11.4846 5.16976 12.2942 4.91437 12.5683 5.43765L13.2834 6.80247C13.6942 7.5866 14.0068 8.42074 14.2127 9.28163C14.2627 9.50496 14.3413 9.7217 14.4475 9.92446C14.7007 10.4077 14.5135 11.0068 14.0303 11.26C13.7786 11.3919 13.9826 11.7811 14.2342 11.6492C14.9321 11.2836 15.2024 10.4184 14.8368 9.72059ZM8.22082 14.1415C8.22082 14.3726 8.03282 14.5605 7.80176 14.5605H0.858692C0.627628 14.5605 0.439659 14.3726 0.439659 14.1415V12.5305H8.22082V14.1415ZM5.64987 8.85926C5.50072 9.17279 5.5297 9.54832 5.72405 9.83587C5.36068 10.2161 4.86217 10.4316 4.33022 10.4316C3.26581 10.4316 2.39985 9.56563 2.39985 8.50122C2.39985 7.43681 3.26581 6.57085 4.33022 6.57085C5.34018 6.57085 6.17092 7.35062 6.2533 8.33965C5.99306 8.41904 5.76686 8.61328 5.64987 8.85926ZM7.24526 4.0302C7.14946 3.95241 7.03893 3.89259 6.91758 3.85468C6.21375 3.63475 5.50491 4.28016 5.65983 5.00092H1.48843C1.44803 5.00092 1.41519 4.96808 1.41519 4.92768V3.35742C1.41519 3.31702 1.44803 3.28418 1.48843 3.28418H7.17202C7.21242 3.28418 7.24526 3.31702 7.24526 3.35742V4.0302ZM8.22082 5.72027L7.68472 4.69702V3.35742C7.68472 3.07474 7.45471 2.84473 7.17202 2.84473H1.48843C1.20574 2.84473 0.975733 3.07474 0.975733 3.35742V4.92771C0.975733 5.21039 1.20574 5.4404 1.48843 5.4404H5.84921L7.56065 8.70703L6.97102 8.39663C6.96841 8.39525 6.96574 8.39391 6.96308 8.39265C6.87577 8.3511 6.78445 8.3231 6.69155 8.30851C6.59306 7.09166 5.572 6.1314 4.33025 6.1314C3.02353 6.1314 1.96043 7.19449 1.96043 8.50122C1.96043 9.80795 3.02353 10.871 4.33025 10.871C4.98563 10.871 5.60016 10.6053 6.04658 10.1354C6.74367 10.5371 7.49956 10.8565 8.22082 11.2133V12.091H0.439659V1.94013H8.22082V5.72027Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_9795_16810">
+<rect width="15" height="15" fill="white"/>
+</clipPath>
+</defs>
+</svg>
--- a/firebase.json
+++ b/firebase.json
@ -1 +1 @@
-{"flutter":{"platforms":{"android":{"default":{"projectId":"syncrow-staging","appId":"1:786692570726:android:0ef7079c2b978d4417b7a7","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"syncrow-staging","appId":"1:786692570726:ios:455a6fcff77e130f17b7a7","uploadDebugSymbols":true,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"syncrow-staging","configurations":{"android":"1:786692570726:android:0ef7079c2b978d4417b7a7","ios":"1:786692570726:ios:455a6fcff77e130f17b7a7","web":"1:786692570726:web:93c931e6701797b317b7a7"}}}}}}
+{"flutter":{"platforms":{"android":{"default":{"projectId":"syncrow-prod-79446","appId":"1:255001682464:android:55ba58e8297b3cab561245","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"syncrow-prod-79446","appId":"1:255001682464:ios:8a57c70f7f16f785561245","uploadDebugSymbols":true,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"syncrow-prod-79446","configurations":{"android":"1:255001682464:android:40e1d92346106850561245","ios":"1:255001682464:ios:40f00bf201768612561245"}},"lib/firebase_options_staging.dart":{"projectId":"syncrow-prod-79446","configurations":{"android":"1:255001682464:android:ed8920a3067fb40a561245","ios":"1:255001682464:ios:41b89a7702b75227561245","web":"1:255001682464:web:a03e2d6214c13101561245"}},"lib/firebase_options_dev.dart":{"projectId":"syncrow-prod-79446","configurations":{"android":"1:255001682464:android:55ba58e8297b3cab561245","ios":"1:255001682464:ios:8a57c70f7f16f785561245","web":"1:255001682464:web:a03e2d6214c13101561245"}}}}}}
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -1,143 +1,80 @@
 PODS:
  - device_info_plus (0.0.1):
    - Flutter
-  - Firebase/Analytics (11.6.0):
-    - Firebase/Core
-  - Firebase/Core (11.6.0):
+  - Firebase/CoreOnly (11.13.0):
+    - FirebaseCore (~> 11.13.0)
+  - Firebase/Crashlytics (11.13.0):
    - Firebase/CoreOnly
-    - FirebaseAnalytics (~> 11.6.0)
-  - Firebase/CoreOnly (11.6.0):
-    - FirebaseCore (~> 11.6.0)
-  - Firebase/Crashlytics (11.6.0):
+    - FirebaseCrashlytics (~> 11.13.0)
+  - Firebase/Database (11.13.0):
    - Firebase/CoreOnly
-    - FirebaseCrashlytics (~> 11.6.0)
-  - Firebase/Database (11.6.0):
-    - Firebase/CoreOnly
-    - FirebaseDatabase (~> 11.6.0)
-  - firebase_analytics (11.4.0):
-    - Firebase/Analytics (= 11.6.0)
+    - FirebaseDatabase (~> 11.13.0)
+  - firebase_core (3.14.0):
+    - Firebase/CoreOnly (= 11.13.0)
+    - Flutter
+  - firebase_crashlytics (4.3.7):
+    - Firebase/Crashlytics (= 11.13.0)
    - firebase_core
    - Flutter
-  - firebase_core (3.10.0):
-    - Firebase/CoreOnly (= 11.6.0)
-    - Flutter
-  - firebase_crashlytics (4.3.0):
-    - Firebase/Crashlytics (= 11.6.0)
+  - firebase_database (11.3.7):
+    - Firebase/Database (= 11.13.0)
    - firebase_core
    - Flutter
-  - firebase_database (11.3.0):
-    - Firebase/Database (= 11.6.0)
-    - firebase_core
-    - Flutter
-  - FirebaseAnalytics (11.6.0):
-    - FirebaseAnalytics/AdIdSupport (= 11.6.0)
-    - FirebaseCore (~> 11.6.0)
-    - FirebaseInstallations (~> 11.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
-    - GoogleUtilities/MethodSwizzler (~> 8.0)
-    - GoogleUtilities/Network (~> 8.0)
-    - "GoogleUtilities/NSData+zlib (~> 8.0)"
-    - nanopb (~> 3.30910.0)
-  - FirebaseAnalytics/AdIdSupport (11.6.0):
-    - FirebaseCore (~> 11.6.0)
-    - FirebaseInstallations (~> 11.0)
-    - GoogleAppMeasurement (= 11.6.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
-    - GoogleUtilities/MethodSwizzler (~> 8.0)
-    - GoogleUtilities/Network (~> 8.0)
-    - "GoogleUtilities/NSData+zlib (~> 8.0)"
-    - nanopb (~> 3.30910.0)
-  - FirebaseAppCheckInterop (11.6.0)
-  - FirebaseCore (11.6.0):
-    - FirebaseCoreInternal (~> 11.6.0)
-    - GoogleUtilities/Environment (~> 8.0)
-    - GoogleUtilities/Logger (~> 8.0)
-  - FirebaseCoreExtension (11.6.0):
-    - FirebaseCore (~> 11.6.0)
-  - FirebaseCoreInternal (11.6.0):
-    - "GoogleUtilities/NSData+zlib (~> 8.0)"
-  - FirebaseCrashlytics (11.6.0):
-    - FirebaseCore (~> 11.6.0)
+  - FirebaseAppCheckInterop (11.15.0)
+  - FirebaseCore (11.13.0):
+    - FirebaseCoreInternal (~> 11.13.0)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/Logger (~> 8.1)
+  - FirebaseCoreExtension (11.13.0):
+    - FirebaseCore (~> 11.13.0)
+  - FirebaseCoreInternal (11.13.0):
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+  - FirebaseCrashlytics (11.13.0):
+    - FirebaseCore (~> 11.13.0)
    - FirebaseInstallations (~> 11.0)
    - FirebaseRemoteConfigInterop (~> 11.0)
    - FirebaseSessions (~> 11.0)
    - GoogleDataTransport (~> 10.0)
-    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/Environment (~> 8.1)
    - nanopb (~> 3.30910.0)
    - PromisesObjC (~> 2.4)
-  - FirebaseDatabase (11.6.0):
+  - FirebaseDatabase (11.13.0):
    - FirebaseAppCheckInterop (~> 11.0)
-    - FirebaseCore (~> 11.6.0)
+    - FirebaseCore (~> 11.13.0)
    - FirebaseSharedSwift (~> 11.0)
-    - GoogleUtilities/UserDefaults (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.1)
    - leveldb-library (~> 1.22)
-  - FirebaseInstallations (11.6.0):
-    - FirebaseCore (~> 11.6.0)
-    - GoogleUtilities/Environment (~> 8.0)
-    - GoogleUtilities/UserDefaults (~> 8.0)
+  - FirebaseInstallations (11.13.0):
+    - FirebaseCore (~> 11.13.0)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
    - PromisesObjC (~> 2.4)
-  - FirebaseRemoteConfigInterop (11.6.0)
-  - FirebaseSessions (11.6.0):
-    - FirebaseCore (~> 11.6.0)
-    - FirebaseCoreExtension (~> 11.6.0)
+  - FirebaseRemoteConfigInterop (11.15.0)
+  - FirebaseSessions (11.13.0):
+    - FirebaseCore (~> 11.13.0)
+    - FirebaseCoreExtension (~> 11.13.0)
    - FirebaseInstallations (~> 11.0)
    - GoogleDataTransport (~> 10.0)
-    - GoogleUtilities/Environment (~> 8.0)
-    - GoogleUtilities/UserDefaults (~> 8.0)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
    - nanopb (~> 3.30910.0)
    - PromisesSwift (~> 2.1)
-  - FirebaseSharedSwift (11.6.0)
+  - FirebaseSharedSwift (11.15.0)
  - Flutter (1.0.0)
  - flutter_secure_storage (6.0.0):
    - Flutter
-  - GoogleAppMeasurement (11.6.0):
-    - GoogleAppMeasurement/AdIdSupport (= 11.6.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
-    - GoogleUtilities/MethodSwizzler (~> 8.0)
-    - GoogleUtilities/Network (~> 8.0)
-    - "GoogleUtilities/NSData+zlib (~> 8.0)"
-    - nanopb (~> 3.30910.0)
-  - GoogleAppMeasurement/AdIdSupport (11.6.0):
-    - GoogleAppMeasurement/WithoutAdIdSupport (= 11.6.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
-    - GoogleUtilities/MethodSwizzler (~> 8.0)
-    - GoogleUtilities/Network (~> 8.0)
-    - "GoogleUtilities/NSData+zlib (~> 8.0)"
-    - nanopb (~> 3.30910.0)
-  - GoogleAppMeasurement/WithoutAdIdSupport (11.6.0):
-    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
-    - GoogleUtilities/MethodSwizzler (~> 8.0)
-    - GoogleUtilities/Network (~> 8.0)
-    - "GoogleUtilities/NSData+zlib (~> 8.0)"
-    - nanopb (~> 3.30910.0)
  - GoogleDataTransport (10.1.0):
    - nanopb (~> 3.30910.0)
    - PromisesObjC (~> 2.4)
-  - GoogleUtilities/AppDelegateSwizzler (8.0.2):
-    - GoogleUtilities/Environment
-    - GoogleUtilities/Logger
-    - GoogleUtilities/Network
+  - GoogleUtilities/Environment (8.1.0):
    - GoogleUtilities/Privacy
-  - GoogleUtilities/Environment (8.0.2):
-    - GoogleUtilities/Privacy
-  - GoogleUtilities/Logger (8.0.2):
+  - GoogleUtilities/Logger (8.1.0):
    - GoogleUtilities/Environment
    - GoogleUtilities/Privacy
-  - GoogleUtilities/MethodSwizzler (8.0.2):
-    - GoogleUtilities/Logger
+  - "GoogleUtilities/NSData+zlib (8.1.0)":
    - GoogleUtilities/Privacy
-  - GoogleUtilities/Network (8.0.2):
-    - GoogleUtilities/Logger
-    - "GoogleUtilities/NSData+zlib"
-    - GoogleUtilities/Privacy
-    - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (8.0.2)":
-    - GoogleUtilities/Privacy
-  - GoogleUtilities/Privacy (8.0.2)
-  - GoogleUtilities/Reachability (8.0.2):
-    - GoogleUtilities/Logger
-    - GoogleUtilities/Privacy
-  - GoogleUtilities/UserDefaults (8.0.2):
+  - GoogleUtilities/Privacy (8.1.0)
+  - GoogleUtilities/UserDefaults (8.1.0):
    - GoogleUtilities/Logger
    - GoogleUtilities/Privacy
  - image_picker_ios (0.0.1):
@ -148,55 +85,6 @@ PODS:
    - nanopb/encode (= 3.30910.0)
  - nanopb/decode (3.30910.0)
  - nanopb/encode (3.30910.0)
-  - onesignal_flutter (5.2.0):
-    - Flutter
-    - OneSignalXCFramework (= 5.2.0)
-  - OneSignalXCFramework (5.2.0):
-    - OneSignalXCFramework/OneSignalComplete (= 5.2.0)
-  - OneSignalXCFramework/OneSignal (5.2.0):
-    - OneSignalXCFramework/OneSignalCore
-    - OneSignalXCFramework/OneSignalExtension
-    - OneSignalXCFramework/OneSignalLiveActivities
-    - OneSignalXCFramework/OneSignalNotifications
-    - OneSignalXCFramework/OneSignalOSCore
-    - OneSignalXCFramework/OneSignalOutcomes
-    - OneSignalXCFramework/OneSignalUser
-  - OneSignalXCFramework/OneSignalComplete (5.2.0):
-    - OneSignalXCFramework/OneSignal
-    - OneSignalXCFramework/OneSignalInAppMessages
-    - OneSignalXCFramework/OneSignalLocation
-  - OneSignalXCFramework/OneSignalCore (5.2.0)
-  - OneSignalXCFramework/OneSignalExtension (5.2.0):
-    - OneSignalXCFramework/OneSignalCore
-    - OneSignalXCFramework/OneSignalOutcomes
-  - OneSignalXCFramework/OneSignalInAppMessages (5.2.0):
-    - OneSignalXCFramework/OneSignalCore
-    - OneSignalXCFramework/OneSignalNotifications
-    - OneSignalXCFramework/OneSignalOSCore
-    - OneSignalXCFramework/OneSignalOutcomes
-    - OneSignalXCFramework/OneSignalUser
-  - OneSignalXCFramework/OneSignalLiveActivities (5.2.0):
-    - OneSignalXCFramework/OneSignalCore
-    - OneSignalXCFramework/OneSignalOSCore
-    - OneSignalXCFramework/OneSignalUser
-  - OneSignalXCFramework/OneSignalLocation (5.2.0):
-    - OneSignalXCFramework/OneSignalCore
-    - OneSignalXCFramework/OneSignalNotifications
-    - OneSignalXCFramework/OneSignalOSCore
-    - OneSignalXCFramework/OneSignalUser
-  - OneSignalXCFramework/OneSignalNotifications (5.2.0):
-    - OneSignalXCFramework/OneSignalCore
-    - OneSignalXCFramework/OneSignalExtension
-    - OneSignalXCFramework/OneSignalOutcomes
-  - OneSignalXCFramework/OneSignalOSCore (5.2.0):
-    - OneSignalXCFramework/OneSignalCore
-  - OneSignalXCFramework/OneSignalOutcomes (5.2.0):
-    - OneSignalXCFramework/OneSignalCore
-  - OneSignalXCFramework/OneSignalUser (5.2.0):
-    - OneSignalXCFramework/OneSignalCore
-    - OneSignalXCFramework/OneSignalNotifications
-    - OneSignalXCFramework/OneSignalOSCore
-    - OneSignalXCFramework/OneSignalOutcomes
  - path_provider_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
@ -210,7 +98,7 @@ PODS:
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - sqflite (0.0.3):
+  - sqflite_darwin (0.0.4):
    - Flutter
    - FlutterMacOS
  - url_launcher_ios (0.0.1):
@ -218,25 +106,22 @@ PODS:

 DEPENDENCIES:
  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
-  - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`)
  - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
  - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
  - firebase_database (from `.symlinks/plugins/firebase_database/ios`)
  - Flutter (from `Flutter`)
  - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
  - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
-  - onesignal_flutter (from `.symlinks/plugins/onesignal_flutter/ios`)
  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
  - share_plus (from `.symlinks/plugins/share_plus/ios`)
  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqflite (from `.symlinks/plugins/sqflite/darwin`)
+  - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)

 SPEC REPOS:
  trunk:
    - Firebase
-    - FirebaseAnalytics
    - FirebaseAppCheckInterop
    - FirebaseCore
    - FirebaseCoreExtension
@ -247,20 +132,16 @@ SPEC REPOS:
    - FirebaseRemoteConfigInterop
    - FirebaseSessions
    - FirebaseSharedSwift
-    - GoogleAppMeasurement
    - GoogleDataTransport
    - GoogleUtilities
    - leveldb-library
    - nanopb
-    - OneSignalXCFramework
    - PromisesObjC
    - PromisesSwift

 EXTERNAL SOURCES:
  device_info_plus:
    :path: ".symlinks/plugins/device_info_plus/ios"
-  firebase_analytics:
-    :path: ".symlinks/plugins/firebase_analytics/ios"
  firebase_core:
    :path: ".symlinks/plugins/firebase_core/ios"
  firebase_crashlytics:
@ -273,8 +154,6 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/flutter_secure_storage/ios"
  image_picker_ios:
    :path: ".symlinks/plugins/image_picker_ios/ios"
-  onesignal_flutter:
-    :path: ".symlinks/plugins/onesignal_flutter/ios"
  path_provider_foundation:
    :path: ".symlinks/plugins/path_provider_foundation/darwin"
  permission_handler_apple:
@ -283,47 +162,42 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/share_plus/ios"
  shared_preferences_foundation:
    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  sqflite:
-    :path: ".symlinks/plugins/sqflite/darwin"
+  sqflite_darwin:
+    :path: ".symlinks/plugins/sqflite_darwin/darwin"
  url_launcher_ios:
    :path: ".symlinks/plugins/url_launcher_ios/ios"

 SPEC CHECKSUMS:
-  device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342
-  Firebase: 374a441a91ead896215703a674d58cdb3e9d772b
-  firebase_analytics: 07bd7cfbac54bfcdccf2bb2530f9a65486f7ef3f
-  firebase_core: feb37e79f775c2bd08dd35e02d83678291317e10
-  firebase_crashlytics: 609a5f6f4a2f5af9e40a68182e0c1be3ca2a02f6
-  firebase_database: adc9efd0b70cdc8d1e6f3c9f6bb054a625c4f45d
-  FirebaseAnalytics: 7114c698cac995602e3b1b96663473e50d54d6e7
-  FirebaseAppCheckInterop: 347aa09a805219a31249b58fc956888e9fcb314b
-  FirebaseCore: 48b0dd707581cf9c1a1220da68223fb0a562afaa
-  FirebaseCoreExtension: 2d77d6430c16cf43ca2b04608302ed02b3598361
-  FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2
-  FirebaseCrashlytics: b21c665fb50138766480bce73ebdb1aa30f7f300
-  FirebaseDatabase: ce3a83a39ab50559a85c5add54f6f285544433b8
-  FirebaseInstallations: efc0946fc756e4d22d8113f7c761948120322e8c
-  FirebaseRemoteConfigInterop: e75e348953352a000331eb77caf01e424248e176
-  FirebaseSessions: 9529d14180868e29a8da164b3a729c036204918b
-  FirebaseSharedSwift: a4e5dfca3e210633bb3a3dfb94176c019211948b
+  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
+  Firebase: 3435bc66b4d494c2f22c79fd3aae4c1db6662327
+  firebase_core: 700bac7ed92bb754fd70fbf01d72b36ecdd6d450
+  firebase_crashlytics: d101fbdc2dba187f483f13ae3ce9281779d664db
+  firebase_database: c808dcb003584f9925917e3b84c2a6547de31117
+  FirebaseAppCheckInterop: 06fe5a3799278ae4667e6c432edd86b1030fa3df
+  FirebaseCore: c692c7f1c75305ab6aff2b367f25e11d73aa8bd0
+  FirebaseCoreExtension: c048485c347616dba6165358dbef765c5197597b
+  FirebaseCoreInternal: 29d7b3af4aaf0b8f3ed20b568c13df399b06f68c
+  FirebaseCrashlytics: 8281e577b6f85a08ea7aeb8b66f95e1ae430c943
+  FirebaseDatabase: 56862f137a44061ca740bc05c57285fffb27becc
+  FirebaseInstallations: 0ee9074f2c1e86561ace168ee1470dc67aabaf02
+  FirebaseRemoteConfigInterop: 1c6135e8a094cc6368949f5faeeca7ee8948b8aa
+  FirebaseSessions: eaa8ec037e7793769defe4201c20bd4d976f9677
+  FirebaseSharedSwift: e17c654ef1f1a616b0b33054e663ad1035c8fd40
  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
-  GoogleAppMeasurement: 6a9e6317b6a6d810ad03d4a66564ca6c4c5818a3
+  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
-  GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
-  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
+  GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
+  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
  leveldb-library: cc8b8f8e013647a295ad3f8cd2ddf49a6f19be19
  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  onesignal_flutter: 5ce68a29861960168e81101cb1bd685d264361de
-  OneSignalXCFramework: bdf74fdc06888f9466dc21e826fe1549ed143095
-  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
-  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
  PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
-  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
-  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
-  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d

 PODFILE CHECKSUM: deba6d843ff3cf709e6e9051ce6601a587b24105

--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -8,6 +8,7 @@

 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		1D86ABCDEBDE5C18BA4024D4 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C7C3AF69AC7495E5213543A5 /* GoogleService-Info.plist */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
@ -50,11 +51,15 @@
 		274C82CD6955A1499B0B1ECC /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		360705D89E99475E029CC3CB /* Pods-RunnerTests.profile-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile-staging.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile-staging.xcconfig"; sourceTree = "<group>"; };
+		366027C8C73E30993A6559C1 /* Pods-RunnerTests.debug-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug-staging.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug-staging.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		4F6A2F89436864C7EE769652 /* Pods-RunnerTests.profile-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile-dev.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile-dev.xcconfig"; sourceTree = "<group>"; };
 		54B9D4926B53AAFC49A54F19 /* Pods-Runner.release-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release-prod.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release-prod.xcconfig"; sourceTree = "<group>"; };
+		66EDA61B784317B71C06349D /* Pods-RunnerTests.release-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release-staging.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release-staging.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		78F71F362D8018E4EEE452EB /* Pods-Runner.profile-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile-staging.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile-staging.xcconfig"; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
@ -64,7 +69,10 @@
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		9D1B204BC7CD29434FE9D537 /* Pods-Runner.profile-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile-dev.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile-dev.xcconfig"; sourceTree = "<group>"; };
+		B83F7E68D31337B2EE230E7E /* Pods-Runner.release-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release-staging.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release-staging.xcconfig"; sourceTree = "<group>"; };
 		C33EAABFBF3F560A8EFB0BC0 /* Pods-RunnerTests.release-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release-dev.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release-dev.xcconfig"; sourceTree = "<group>"; };
+		C7C3AF69AC7495E5213543A5 /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
+		D4A8BEAA2CBF924DE3581BD1 /* Pods-Runner.debug-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug-staging.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug-staging.xcconfig"; sourceTree = "<group>"; };
 		E0A467016A4C6B17ECA05534 /* Pods-Runner.profile-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile-prod.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile-prod.xcconfig"; sourceTree = "<group>"; };
 		E2512B7B8C737577EB9DB570 /* Pods-RunnerTests.debug-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug-dev.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug-dev.xcconfig"; sourceTree = "<group>"; };
 		F5E8A17F8AB7D50983179FD3 /* Pods-Runner.debug-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug-dev.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug-dev.xcconfig"; sourceTree = "<group>"; };
@ -108,6 +116,12 @@
 				C33EAABFBF3F560A8EFB0BC0 /* Pods-RunnerTests.release-dev.xcconfig */,
 				0D60D6C4BBD804473BD9E4A0 /* Pods-RunnerTests.profile-prod.xcconfig */,
 				4F6A2F89436864C7EE769652 /* Pods-RunnerTests.profile-dev.xcconfig */,
+				D4A8BEAA2CBF924DE3581BD1 /* Pods-Runner.debug-staging.xcconfig */,
+				B83F7E68D31337B2EE230E7E /* Pods-Runner.release-staging.xcconfig */,
+				78F71F362D8018E4EEE452EB /* Pods-Runner.profile-staging.xcconfig */,
+				366027C8C73E30993A6559C1 /* Pods-RunnerTests.debug-staging.xcconfig */,
+				66EDA61B784317B71C06349D /* Pods-RunnerTests.release-staging.xcconfig */,
+				360705D89E99475E029CC3CB /* Pods-RunnerTests.profile-staging.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@ -149,6 +163,7 @@
 				331C8082294A63A400263BE5 /* RunnerTests */,
 				2F70EB4341A83C900EB253DC /* Pods */,
 				61B46FA3FB0932D29E3C6E47 /* Frameworks */,
+				C7C3AF69AC7495E5213543A5 /* GoogleService-Info.plist */,
 			);
 			sourceTree = "<group>";
 		};
@ -278,6 +293,7 @@
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
+				1D86ABCDEBDE5C18BA4024D4 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -333,7 +349,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\n#!/bin/bash\nPATH=${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=$PODS_ROOT/FirebaseCrashlytics/upload-symbols --platform=ios --apple-project-path=${SRCROOT} --env-platform-name=${PLATFORM_NAME} --env-configuration=${CONFIGURATION} --env-project-dir=${PROJECT_DIR} --env-built-products-dir=${BUILT_PRODUCTS_DIR} --env-dwarf-dsym-folder-path=${DWARF_DSYM_FOLDER_PATH} --env-dwarf-dsym-file-name=${DWARF_DSYM_FILE_NAME} --env-infoplist-path=${INFOPLIST_PATH} --default-config=default\n";
+			shellScript = "\n#!/bin/bash\nPATH=\"${PATH}:$FLUTTER_ROOT/bin:${PUB_CACHE}/bin:$HOME/.pub-cache/bin\"\n\nif [ -z \"$PODS_ROOT\" ] || [ ! -d \"$PODS_ROOT/FirebaseCrashlytics\" ]; then\n  # Cannot use \"BUILD_DIR%/Build/*\" as per Firebase documentation, it points to \"flutter-project/build/ios/*\" path which doesn't have run script\n  DERIVED_DATA_PATH=$(echo \"$BUILD_ROOT\" | sed -E 's|(.*DerivedData/[^/]+).*|\\1|')\n  PATH_TO_CRASHLYTICS_UPLOAD_SCRIPT=\"${DERIVED_DATA_PATH}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run\"\nelse\n  PATH_TO_CRASHLYTICS_UPLOAD_SCRIPT=\"$PODS_ROOT/FirebaseCrashlytics/run\"\nfi\n\n# Command to upload symbols script used to upload symbols to Firebase server\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=\"$PATH_TO_CRASHLYTICS_UPLOAD_SCRIPT\" --platform=ios --apple-project-path=\"${SRCROOT}\" --env-platform-name=\"${PLATFORM_NAME}\" --env-configuration=\"${CONFIGURATION}\" --env-project-dir=\"${PROJECT_DIR}\" --env-built-products-dir=\"${BUILT_PRODUCTS_DIR}\" --env-dwarf-dsym-folder-path=\"${DWARF_DSYM_FOLDER_PATH}\" --env-dwarf-dsym-file-name=\"${DWARF_DSYM_FILE_NAME}\" --env-infoplist-path=\"${INFOPLIST_PATH}\" --default-config=default\n";
 		};
 		6CF71F42A45B39E9945C8410 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
@ -405,7 +421,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Get a reference to the destination location for the GoogleService-Info.plist\n# This is the default location where Firebase init code expects to find GoogleServices-Info.plist file.\nPLIST_DESTINATION=${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app\n# We have named our Build Configurations as Debug-dev, Debug-prod etc.\n# Here, dev and prod are the scheme names. This kind of naming is required by Flutter for flavors to work.\n# We are using the $CONFIGURATION variable available in the XCode build environment to get the build configuration.\nif [ \"${CONFIGURATION}\" == \"Debug-prod\" ] || [ \"${CONFIGURATION}\" == \"Release-prod\" ] || [ \"${CONFIGURATION}\" == \"Profile-prod\" ] || [ \"${CONFIGURATION}\" == \"Release\" ]; then\ncp \"${PROJECT_DIR}/config/prod/GoogleService-Info.plist\" \"${PLIST_DESTINATION}/GoogleService-Info.plist\"\necho \"Production plist copied\"\nelif [ \"${CONFIGURATION}\" == \"Debug-dev\" ] || [ \"${CONFIGURATION}\" == \"Release-dev\" ] || [ \"${CONFIGURATION}\" == \"Profile-dev\" ] || [ \"${CONFIGURATION}\" == \"Debug\" ]; then\ncp \"${PROJECT_DIR}/config/dev/GoogleService-Info.plist\" \"${PLIST_DESTINATION}/GoogleService-Info.plist\"\necho \"Development plist copied\"\nfi\n";
+			shellScript = "# Get a reference to the destination location for the GoogleService-Info.plist\n# This is the default location where Firebase init code expects to find GoogleServices-Info.plist file.\nPLIST_DESTINATION=${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app\n# We have named our Build Configurations as Debug-dev, Debug-prod etc.\n# Here, dev and prod are the scheme names. This kind of naming is required by Flutter for flavors to work.\n# We are using the $CONFIGURATION variable available in the XCode build environment to get the build configuration.\nif [ \"${CONFIGURATION}\" == \"Debug-prod\" ] || [ \"${CONFIGURATION}\" == \"Release-prod\" ] || [ \"${CONFIGURATION}\" == \"Profile-prod\" ] || [ \"${CONFIGURATION}\" == \"Release\" ]; then\ncp \"${PROJECT_DIR}/config/prod/GoogleService-Info.plist\" \"${PLIST_DESTINATION}/GoogleService-Info.plist\"\necho \"Production plist copied\"\nelif [ \"${CONFIGURATION}\" == \"Debug-staging\" ] || [ \"${CONFIGURATION}\" == \"Release-staging\" ] || [ \"${CONFIGURATION}\" == \"Profile-staging\" ]; then\ncp \"${PROJECT_DIR}/config/staging/GoogleService-Info.plist\" \"${PLIST_DESTINATION}/GoogleService-Info.plist\"\necho \"Staging plist copied\"\nelif [ \"${CONFIGURATION}\" == \"Debug-dev\" ] || [ \"${CONFIGURATION}\" == \"Release-dev\" ] || [ \"${CONFIGURATION}\" == \"Profile-dev\" ] || [ \"${CONFIGURATION}\" == \"Debug\" ]; then\ncp \"${PROJECT_DIR}/config/dev/GoogleService-Info.plist\" \"${PLIST_DESTINATION}/GoogleService-Info.plist\"\necho \"Development plist copied\"\nfi\n";
 		};
 		BF71A0E0099ADA10FE9B580A /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@ -525,6 +541,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@ -537,23 +554,26 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 31;
+				DART_DEBUG_BONJOUR_SERVICE = "";
 				DEVELOPMENT_TEAM = 48V27SBR8J;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
+				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
+				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.5;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrow.app;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@ -612,11 +632,11 @@
 			};
 			name = "Profile-prod";
 		};
-		97C147031CF9000F007C117D /* Debug-prod */ = {
+		3483022B2E23986E0002E53F /* Debug-staging */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@ -665,12 +685,170 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.staging;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
-			name = "Debug-prod";
+			name = "Debug-staging";
 		};
-		97C147041CF9000F007C117D /* Release-prod */ = {
+		3483022C2E23986E0002E53F /* Debug-staging */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 31;
+				DART_DEBUG_BONJOUR_SERVICE = _dartobservatory._tcp;
+				DEVELOPMENT_TEAM = 48V27SBR8J;
+				ENABLE_BITCODE = NO;
+				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
+				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				MARKETING_VERSION = 1.0.5;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.staging;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = "Debug-staging";
+		};
+		3483022D2E23986E0002E53F /* Debug-staging */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 366027C8C73E30993A6559C1 /* Pods-RunnerTests.debug-staging.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrowApp.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = "Debug-staging";
+		};
+		3483022E2E2398790002E53F /* Release-staging */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.staging;
+				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = "Release-staging";
+		};
+		3483022F2E2398790002E53F /* Release-staging */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 31;
+				DART_DEBUG_BONJOUR_SERVICE = _dartobservatory._tcp;
+				DEVELOPMENT_TEAM = 48V27SBR8J;
+				ENABLE_BITCODE = NO;
+				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
+				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				MARKETING_VERSION = 1.0.5;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.staging;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = "Release-staging";
+		};
+		348302302E2398790002E53F /* Release-staging */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 66EDA61B784317B71C06349D /* Pods-RunnerTests.release-staging.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrowApp.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = "Release-staging";
+		};
+		348302312E2398800002E53F /* Profile-staging */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@ -716,81 +894,68 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.staging;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
-			name = "Release-prod";
+			name = "Profile-staging";
 		};
-		97C147061CF9000F007C117D /* Debug-prod */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
-				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 31;
-				DEVELOPMENT_TEAM = 48V27SBR8J;
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				MARKETING_VERSION = 1.0.5;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrow.app;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = "Debug-prod";
-		};
-		97C147071CF9000F007C117D /* Release-prod */ = {
+		348302322E2398800002E53F /* Profile-staging */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 31;
+				DART_DEBUG_BONJOUR_SERVICE = _dartobservatory._tcp;
 				DEVELOPMENT_TEAM = 48V27SBR8J;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
+				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
+				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.5;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrow.app;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.staging;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
-			name = "Release-prod";
+			name = "Profile-staging";
 		};
-		B07E4A0C2C9B8C45001F6910 /* Debug-dev */ = {
+		348302332E2398800002E53F /* Profile-staging */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 360705D89E99475E029CC3CB /* Pods-RunnerTests.profile-staging.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrowApp.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = "Profile-staging";
+		};
+		97C147031CF9000F007C117D /* Debug-prod */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@ -839,6 +1004,189 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = "Debug-prod";
+		};
+		97C147041CF9000F007C117D /* Release-prod */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex;
+				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = "Release-prod";
+		};
+		97C147061CF9000F007C117D /* Debug-prod */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 31;
+				DART_DEBUG_BONJOUR_SERVICE = "";
+				DEVELOPMENT_TEAM = 48V27SBR8J;
+				ENABLE_BITCODE = NO;
+				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
+				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				MARKETING_VERSION = 1.0.5;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = "Debug-prod";
+		};
+		97C147071CF9000F007C117D /* Release-prod */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 31;
+				DART_DEBUG_BONJOUR_SERVICE = "";
+				DEVELOPMENT_TEAM = 48V27SBR8J;
+				ENABLE_BITCODE = NO;
+				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
+				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				MARKETING_VERSION = 1.0.5;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = "Release-prod";
+		};
+		B07E4A0C2C9B8C45001F6910 /* Debug-dev */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.dev;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@ -849,23 +1197,26 @@
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 31;
+				DART_DEBUG_BONJOUR_SERVICE = _dartobservatory._tcp;
 				DEVELOPMENT_TEAM = 48V27SBR8J;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
+				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
+				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.5;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrow.app;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@ -897,7 +1248,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@ -939,6 +1290,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.dev;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@ -953,23 +1305,26 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 31;
+				DART_DEBUG_BONJOUR_SERVICE = _dartobservatory._tcp;
 				DEVELOPMENT_TEAM = 48V27SBR8J;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
+				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
+				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.5;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrow.app;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@ -998,7 +1353,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@ -1040,6 +1395,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.dev;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@ -1052,23 +1408,26 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 31;
+				DART_DEBUG_BONJOUR_SERVICE = _dartobservatory._tcp;
 				DEVELOPMENT_TEAM = 48V27SBR8J;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
+				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
+				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.5;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrow.app;
+				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@ -1100,10 +1459,13 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				331C8088294A63A400263BE5 /* Debug-prod */,
+				3483022D2E23986E0002E53F /* Debug-staging */,
 				B07E4A0E2C9B8C45001F6910 /* Debug-dev */,
 				331C8089294A63A400263BE5 /* Release-prod */,
+				348302302E2398790002E53F /* Release-staging */,
 				B07E4A112C9B8C52001F6910 /* Release-dev */,
 				331C808A294A63A400263BE5 /* Profile-prod */,
+				348302332E2398800002E53F /* Profile-staging */,
 				B07E4A142C9B8C5C001F6910 /* Profile-dev */,
 			);
 			defaultConfigurationIsVisible = 0;
@ -1113,10 +1475,13 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				97C147031CF9000F007C117D /* Debug-prod */,
+				3483022B2E23986E0002E53F /* Debug-staging */,
 				B07E4A0C2C9B8C45001F6910 /* Debug-dev */,
 				97C147041CF9000F007C117D /* Release-prod */,
+				3483022E2E2398790002E53F /* Release-staging */,
 				B07E4A0F2C9B8C52001F6910 /* Release-dev */,
 				249021D3217E4FDB00AE95B9 /* Profile-prod */,
+				348302312E2398800002E53F /* Profile-staging */,
 				B07E4A122C9B8C5C001F6910 /* Profile-dev */,
 			);
 			defaultConfigurationIsVisible = 0;
@ -1126,10 +1491,13 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				97C147061CF9000F007C117D /* Debug-prod */,
+				3483022C2E23986E0002E53F /* Debug-staging */,
 				B07E4A0D2C9B8C45001F6910 /* Debug-dev */,
 				97C147071CF9000F007C117D /* Release-prod */,
+				3483022F2E2398790002E53F /* Release-staging */,
 				B07E4A102C9B8C52001F6910 /* Release-dev */,
 				249021D4217E4FDB00AE95B9 /* Profile-prod */,
+				348302322E2398800002E53F /* Profile-staging */,
 				B07E4A132C9B8C5C001F6910 /* Profile-dev */,
 			);
 			defaultConfigurationIsVisible = 0;
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/dev.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/dev.xcscheme
@ -26,6 +26,7 @@
      buildConfiguration = "Debug-dev"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
      shouldUseLaunchSchemeArgsEnv = "YES"
      shouldAutocreateTestPlan = "YES">
   </TestAction>
@ -33,6 +34,7 @@
      buildConfiguration = "Debug-dev"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/prod.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/prod.xcscheme
@ -26,6 +26,7 @@
      buildConfiguration = "Debug-prod"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
      shouldUseLaunchSchemeArgsEnv = "YES">
      <MacroExpansion>
         <BuildableReference
@ -54,6 +55,7 @@
      buildConfiguration = "Debug-prod"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/staging.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/staging.xcscheme
@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1640"
+   version = "2.2">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <AutocreatedTestPlanReference>
+            </AutocreatedTestPlanReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+               BuildableName = "Runner.app"
+               BlueprintName = "Runner"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug-staging"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug-staging"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Profile-staging"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug-staging">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release-staging"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@ -1,122 +1 @@
-{
-  "images" : [
-    {
-      "filename" : "Syncrow Icon-20@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Syncrow Icon-20@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Syncrow Icon-29.png",
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Syncrow Icon-29@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Syncrow Icon-29@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Syncrow Icon-40@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Syncrow Icon-40@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Syncrow Icon-60@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "Syncrow Icon-60@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "Syncrow Icon-20.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Syncrow Icon-20@2x 1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Syncrow Icon-29 1.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Syncrow Icon-29@2x 1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Syncrow Icon-40.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Syncrow Icon-40@2x 1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Syncrow Icon-76.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "Syncrow Icon-76@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "Syncrow Icon-83.5@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
-    },
-    {
-      "filename" : "Syncrow Icon-1024.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
+{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow
--- a/ios/Runner/GoogleService-Info.plist
+++ b/ios/Runner/GoogleService-Info.plist
@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>API_KEY</key>
+	<string>AIzaSyDeUWSHReSROpDbENGr--F49DH4VRzVM5A</string>
+	<key>GCM_SENDER_ID</key>
+	<string>255001682464</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.syncrow.iot.ex</string>
+	<key>PROJECT_ID</key>
+	<string>syncrow-prod-79446</string>
+	<key>STORAGE_BUCKET</key>
+	<string>syncrow-prod-79446.firebasestorage.app</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:255001682464:ios:40f00bf201768612561245</string>
+	<key>DATABASE_URL</key>
+	<string>https://syncrow-prod-79446-default-rtdb.firebaseio.com</string>
+</dict>
+</plist>
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Syncrow App</string>
+	<string>SyncOS</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@ -15,7 +15,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>syncrow_app</string>
+	<string>SyncOS</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@ -24,8 +24,15 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>sms</string>
+		<string>tel</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSLocalNetworkUsageDescription</key>
+	<string>SyncOS needs to access the local network to discover and connect to SyncOS devices.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>We need access to your photo library to allow you to select and upload photos.</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
@ -37,11 +44,16 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
-	<key>LSApplicationQueriesSchemes</key>
+	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
-  	<string>sms</string>
-  	<string>tel</string>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 </dict>
 </plist>
--- a/ios/config/dev/GoogleService-Info.plist
+++ b/ios/config/dev/GoogleService-Info.plist
@ -3,17 +3,17 @@
 <plist version="1.0">
 <dict>
 	<key>API_KEY</key>
-	<string>AIzaSyABnpH6yo2RRjtkp4PlvtK84hKwRm2DhBw</string>
+	<string>AIzaSyDeUWSHReSROpDbENGr--F49DH4VRzVM5A</string>
 	<key>GCM_SENDER_ID</key>
-	<string>427332280600</string>
+	<string>255001682464</string>
 	<key>PLIST_VERSION</key>
 	<string>1</string>
 	<key>BUNDLE_ID</key>
-	<string>com.example.syncrow.app</string>
+	<string>com.syncrow.iot.ex.dev</string>
 	<key>PROJECT_ID</key>
-	<string>test2-8a3d2</string>
+	<string>syncrow-prod-79446</string>
 	<key>STORAGE_BUCKET</key>
-	<string>test2-8a3d2.appspot.com</string>
+	<string>syncrow-prod-79446.firebasestorage.app</string>
 	<key>IS_ADS_ENABLED</key>
 	<false></false>
 	<key>IS_ANALYTICS_ENABLED</key>
@ -25,6 +25,8 @@
 	<key>IS_SIGNIN_ENABLED</key>
 	<true></true>
 	<key>GOOGLE_APP_ID</key>
-	<string>1:427332280600:ios:c904c0a7a19a4ed90c7e6d</string>
+	<string>1:255001682464:ios:40f00bf201768612561245</string>
+	<key>DATABASE_URL</key>
+	<string>https://syncrow-dev-79446.asia-southeast1.firebasedatabase.app/</string>
 </dict>
 </plist>
--- a/ios/config/prod/GoogleService-Info.plist
+++ b/ios/config/prod/GoogleService-Info.plist
@ -3,17 +3,17 @@
 <plist version="1.0">
 <dict>
 	<key>API_KEY</key>
-	<string>AIzaSyAWlRiuJ75FMlf2_UDdri1voWKvkaSHtRg</string>
+	<string>AIzaSyDeUWSHReSROpDbENGr--F49DH4VRzVM5A</string>
 	<key>GCM_SENDER_ID</key>
-	<string>786692570726</string>
+	<string>255001682464</string>
 	<key>PLIST_VERSION</key>
 	<string>1</string>
 	<key>BUNDLE_ID</key>
-	<string>com.example.syncrow.app</string>
+	<string>com.syncrow.iot.ex</string>
 	<key>PROJECT_ID</key>
-	<string>syncrow-staging</string>
+	<string>syncrow-prod-79446</string>
 	<key>STORAGE_BUCKET</key>
-	<string>syncrow-staging.appspot.com</string>
+	<string>syncrow-prod-79446.firebasestorage.app</string>
 	<key>IS_ADS_ENABLED</key>
 	<false></false>
 	<key>IS_ANALYTICS_ENABLED</key>
@ -25,8 +25,8 @@
 	<key>IS_SIGNIN_ENABLED</key>
 	<true></true>
 	<key>GOOGLE_APP_ID</key>
-	<string>1:786692570726:ios:455a6fcff77e130f17b7a7</string>
+	<string>1:255001682464:ios:40f00bf201768612561245</string>
 	<key>DATABASE_URL</key>
-	<string>https://syncrow-staging-default-rtdb.firebaseio.com</string>
+	<string>https://syncrow-prod-79446.asia-southeast1.firebasedatabase.app/</string>
 </dict>
 </plist>
--- a/ios/config/staging/GoogleService-Info.plist
+++ b/ios/config/staging/GoogleService-Info.plist
@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>API_KEY</key>
+	<string>AIzaSyDeUWSHReSROpDbENGr--F49DH4VRzVM5A</string>
+	<key>GCM_SENDER_ID</key>
+	<string>255001682464</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.syncrow.iot.ex.staging</string>
+	<key>PROJECT_ID</key>
+	<string>syncrow-prod-79446</string>
+	<key>STORAGE_BUCKET</key>
+	<string>syncrow-prod-79446.firebasestorage.app</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:255001682464:ios:40f00bf201768612561245</string>
+	<key>DATABASE_URL</key>
+	<string>https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/</string>
+</dict>
+</plist>
--- a/lib/features/app_layout/bloc/home_cubit.dart
+++ b/lib/features/app_layout/bloc/home_cubit.dart
@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:onesignal_flutter/onesignal_flutter.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:syncrow_app/features/app_layout/model/permission_model.dart';
@ -196,63 +195,6 @@ class HomeCubit extends Cubit<HomeState> {
  //   emit(SpaceSelected(space));
  // }

-  checkIfNotificationPermissionGranted() async {
-    try {
-      OneSignal.initialize('762350c9-1e5d-4d95-a648-16d4dc8a25e1');
-
-      //Show native push notification dialog
-      if (Platform.isIOS) {
-        await OneSignal.Notifications.permissionNative();
-      } else {
-        await OneSignal.Notifications.requestPermission(true);
-      }
-
-      if (await Permission.notification.isGranted == false) {
-        return;
-      }
-
-      var userUuid =
-          await const FlutterSecureStorage().read(key: UserModel.userUuidKey) ??
-              '';
-      if (userUuid.isNotEmpty) {
-        await OneSignal.login(userUuid);
-      }
-      //Enable push notifications
-      await OneSignal.User.pushSubscription.optIn();
-
-      // //this function will be called once a user is subscribed
-      // oneSignalSubscriptionObserver =
-      //     OneSignal.User.pushSubscription.addObserver((state) async {
-      //   if (state.current.optedIn) {
-      //     await _sendSubscriptionId();
-      //   }
-      // });
-
-      // // Send the player id when a user allows notifications
-      // oneSignalPermissionObserver =
-      //     OneSignal.Notifications.addPermissionObserver((state) async {
-      //   await _sendSubscriptionId();
-      // });
-
-      // //check if the player id is sent, if not send it again
-      // await _sendSubscriptionId();
-
-      // oneSignalClickListenerObserver =
-      //     OneSignal.Notifications.addClickListener((event) async {
-      //   //Once the user clicks on the notification
-      // });
-    } catch (err) {
-      debugPrint("******* Error");
-      debugPrint(err.toString());
-      rethrow;
-    }
-  }
-
-  _sendSubscriptionId() async {
-    // String? subscriptionId = OneSignal.User.pushSubscription.id ?? '';
-    //TODO send the subscription id to BE
-  }
-
  changeSelectedSpace(SpaceModel space) {
    selectedSpace = space;
    emitSafe(SpaceSelected(space));
--- a/lib/features/auth/bloc/auth_cubit.dart
+++ b/lib/features/auth/bloc/auth_cubit.dart
@ -270,7 +270,7 @@ class AuthCubit extends Cubit<AuthState> {

  Future<bool> reSendOtp({bool? forget}) async {
    try {
-      emit(AuthLoading());
+      emit(ResendOtpLoading());
      await AuthenticationAPI.sendOtp(body: {
        'email': email,
        'type': forget == true ? 'PASSWORD' : 'VERIFICATION'
@ -286,7 +286,10 @@ class AuthCubit extends Cubit<AuthState> {
  }

  verifyOtp(bool isForgotPass) async {
-    emit(AuthLoginLoading());
+    if (otpCode.length != 6) {
+      return;
+    }
+    emit(AuthOtpLoading());
    try {
      final response = await AuthenticationAPI.verifyPassCode(body: {
        'email': email,
--- a/lib/features/auth/bloc/auth_state.dart
+++ b/lib/features/auth/bloc/auth_state.dart
@ -20,9 +20,13 @@ class AuthLoginLoading extends AuthLoading {}

 class AuthLoginSuccess extends AuthSuccess {}

+class AuthSignUpSuccess extends AuthSuccess {}
+
 class AuthOtpSuccess extends AuthSuccess {}

-class AuthSignUpSuccess extends AuthSuccess {}
+class AuthOtpLoading extends AuthLoading {}
+
+class ResendOtpLoading extends AuthLoading {}

 class ResendOtpSuccess extends AuthSuccess {}

--- a/lib/features/auth/model/user_model.dart
+++ b/lib/features/auth/model/user_model.dart
@ -22,7 +22,7 @@ class UserModel {
  final DateTime? appAgreementAcceptedAt;
  final Role? role;
  final Project? project;
-
+  final int? points;
  UserModel({
    required this.uuid,
    required this.email,
@ -41,6 +41,7 @@ class UserModel {
    required this.appAgreementAcceptedAt,
    required this.role,
    required this.project,
+    this.points,
  });

  factory UserModel.fromJson(Map<String, dynamic> json) {
@ -67,33 +68,36 @@ class UserModel {
      role: json['role'] != null ? Role.fromJson(json['role']) : null,
      project:
          json['project'] != null ? Project.fromJson(json['project']) : null,
+      points: json['points'],
    );
  }

  factory UserModel.fromToken(Token token) {
    Map<String, dynamic> tempJson = Token.decodeToken(token.accessToken);
    return UserModel(
-        uuid: tempJson['uuid'].toString(),
-        email: tempJson['email'],
-        lastName: tempJson['lastName'],
-        firstName: tempJson['firstName'],
-        profilePicture: UserModel.decodeBase64Image(tempJson['profilePicture']),
-        phoneNumber: null,
-        isEmailVerified: null,
-        isAgreementAccepted: null,
-        regionUuid: null,
-        regionName: tempJson['region']?['regionName'],
-        timeZone: tempJson['timezone']?['timeZoneOffset'],
-        hasAcceptedWebAgreement: tempJson['hasAcceptedWebAgreement'],
-        webAgreementAcceptedAt: tempJson['webAgreementAcceptedAt'] != null
-            ? DateTime.parse(tempJson['webAgreementAcceptedAt'])
-            : null,
-        hasAcceptedAppAgreement: tempJson['hasAcceptedAppAgreement'],
-        appAgreementAcceptedAt: tempJson['appAgreementAcceptedAt'] != null
-            ? DateTime.parse(tempJson['appAgreementAcceptedAt'])
-            : null,
-        role: tempJson['role'] != null ? Role.fromJson(tempJson['role']) : null,
-        project: null);
+      uuid: tempJson['uuid'].toString(),
+      email: tempJson['email'],
+      lastName: tempJson['lastName'],
+      firstName: tempJson['firstName'],
+      profilePicture: UserModel.decodeBase64Image(tempJson['profilePicture']),
+      phoneNumber: null,
+      isEmailVerified: null,
+      isAgreementAccepted: null,
+      regionUuid: null,
+      regionName: tempJson['region']?['regionName'],
+      timeZone: tempJson['timezone']?['timeZoneOffset'],
+      hasAcceptedWebAgreement: tempJson['hasAcceptedWebAgreement'],
+      webAgreementAcceptedAt: tempJson['webAgreementAcceptedAt'] != null
+          ? DateTime.parse(tempJson['webAgreementAcceptedAt'])
+          : null,
+      hasAcceptedAppAgreement: tempJson['hasAcceptedAppAgreement'],
+      appAgreementAcceptedAt: tempJson['appAgreementAcceptedAt'] != null
+          ? DateTime.parse(tempJson['appAgreementAcceptedAt'])
+          : null,
+      role: tempJson['role'] != null ? Role.fromJson(tempJson['role']) : null,
+      project: null,
+      points: tempJson['points'],
+    );
  }

  static Uint8List? decodeBase64Image(String? base64String) {
--- a/lib/features/auth/view/otp_view.dart
+++ b/lib/features/auth/view/otp_view.dart
@ -321,7 +321,7 @@ class _OtpViewState extends State<OtpView> {
                                  Expanded(
                                    child: DefaultButton(
                                      isDone: state is AuthLoginSuccess,
-                                      isLoading: state is AuthLoading,
+                                      isLoading: state is AuthOtpLoading,
                                      customButtonStyle: ButtonStyle(
                                        backgroundColor:
                                            MaterialStateProperty.all(
@ -349,8 +349,8 @@ class _OtpViewState extends State<OtpView> {
                                  ),
                                  Expanded(
                                    child: DefaultButton(
-                                      isDone: state is AuthLoginSuccess,
-                                      isLoading: state is AuthLoading,
+                                      isDone: state is ResendOtpSuccess,
+                                      isLoading: state is ResendOtpLoading,
                                      customButtonStyle: ButtonStyle(
                                        backgroundColor:
                                            MaterialStateProperty.all(
@ -383,7 +383,8 @@ class _OtpViewState extends State<OtpView> {
                                          if (success) {
                                            showDialog(
                                                context: context,
-                                                builder: (_) =>const SuccessDialog(
+                                                builder: (_) =>
+                                                    const SuccessDialog(
                                                      key: ValueKey(
                                                          'SuccessDialog'),
                                                      message: 'New OTP sent!',
--- a/lib/features/booking_system/data/booking_dummy_source.dart
+++ b/lib/features/booking_system/data/booking_dummy_source.dart
@ -0,0 +1,32 @@
+import 'package:syncrow_app/features/booking_system/domain/booking_model.dart';
+import 'package:syncrow_app/features/booking_system/domain/booking_service.dart';
+
+class BookingDummySource implements BookingService {
+  @override
+  Future<List<BookingModel>> get() async {
+    await Future.delayed(Duration(seconds: 2));
+    return [
+      BookingModel(
+        uuid: 'uuid1',
+        roomName: 'roomName1',
+        date: 'wed 28th May 2025',
+        timeSlot: '10:30 AM - 11:30 AM',
+        cost: 4,
+      ),
+      BookingModel(
+        uuid: 'uuid2',
+        roomName: 'roomName2',
+        date: 'wed 28th May 2025',
+        timeSlot: '10:30 AM - 11:30 AM',
+        cost: 6,
+      ),
+      BookingModel(
+        uuid: 'uuid3',
+        roomName: 'roomName3',
+        date: 'thur 2th june 2025',
+        timeSlot: '10:30 AM - 1:30 PM',
+        cost: 10,
+      )
+    ];
+  }
+}
--- a/lib/features/booking_system/data/booking_remote_source.dart
+++ b/lib/features/booking_system/data/booking_remote_source.dart
@ -0,0 +1,35 @@
+import 'package:dio/dio.dart';
+import 'package:syncrow_app/features/booking_system/domain/booking_model.dart';
+import 'package:syncrow_app/features/booking_system/domain/booking_service.dart';
+import 'package:syncrow_app/services/api/api_links_endpoints.dart';
+import 'package:syncrow_app/services/api/http_service.dart';
+
+class BookingRemoteSource implements BookingService {
+  final HTTPService _httpService;
+  BookingRemoteSource(this._httpService);
+
+  @override
+  Future<List<BookingModel>> get() async {
+    try {
+      return _httpService.get(
+        path: ApiEndpoints.upcomingBookings,
+        expectedResponseModel: (json) {
+          return BookingModel.fromJsonList(json['data']);
+        },
+      );
+    } on DioException catch (e) {
+      return [];
+      // final message = e.response?.data as Map<String, dynamic>?;
+      //     final error = message?['error'] as Map<String, dynamic>?;
+      //     final errorMessage = error?['error'] as String? ?? '';
+      //     final formattedErrorMessage =
+      //         [_defaultErrorMessage, errorMessage].join(': ');
+      //     throw APIException(formattedErrorMessage);
+      //   } catch (e) {
+      //     final formattedErrorMessage = [_defaultErrorMessage, '$e'].join(': ');
+      //     throw APIException(formattedErrorMessage);
+      //   }
+      //
+    }
+  }
+}
--- a/lib/features/booking_system/domain/booking_model.dart
+++ b/lib/features/booking_system/domain/booking_model.dart
@ -0,0 +1,39 @@
+class BookingModel {
+  final String uuid, roomName, date, timeSlot;
+  final int cost;
+  BookingModel({
+    required this.uuid,
+    required this.roomName,
+    required this.date,
+    required this.timeSlot,
+    required this.cost,
+  });
+  factory BookingModel.zero() => BookingModel(
+        uuid: '',
+        roomName: '',
+        date: '',
+        timeSlot: '',
+        cost: -1,
+      );
+  factory BookingModel.fromJson(Map<String, dynamic> json) => BookingModel(
+        uuid: json['uuid'] as String,
+        roomName: json['roomName'] as String,
+        date: json['date'] as String,
+        timeSlot: json['timeSlot'] as String,
+        cost: json['cost'] as int,
+      );
+
+  static List<BookingModel> fromJsonList(List<dynamic> jsonList) => jsonList
+      .map(
+        (bookModel) => BookingModel.fromJson(bookModel),
+      )
+      .toList();
+
+  Map<String, dynamic> toJson() => {
+        'uuid': uuid,
+        'roomName': roomName,
+        'date': date,
+        'timeSlot': timeSlot,
+        'cost': cost,
+      };
+}
--- a/lib/features/booking_system/domain/booking_service.dart
+++ b/lib/features/booking_system/domain/booking_service.dart
@ -0,0 +1,5 @@
+import 'package:syncrow_app/features/booking_system/domain/booking_model.dart';
+
+abstract interface class BookingService {
+  Future<List<BookingModel>> get();
+}
--- a/lib/features/booking_system/presentation/blocs/past_bookings_bloc/past_bookings_bloc.dart
+++ b/lib/features/booking_system/presentation/blocs/past_bookings_bloc/past_bookings_bloc.dart
@ -0,0 +1,32 @@
+import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.dart';
+
+import '../../../domain/booking_model.dart';
+import '../../../domain/booking_service.dart';
+
+part 'past_bookings_event.dart';
+part 'past_bookings_state.dart';
+
+class PastBookingsBloc extends Bloc<PastBookingsEvent, PastBookingsState> {
+  final BookingService _bookingService;
+
+  PastBookingsBloc(this._bookingService) : super(PastBookingsInitial()) {
+    on<GetPastBookingsEvent>(_onGetPastBookingsEvent);
+  }
+  Future<void> _onGetPastBookingsEvent(
+    GetPastBookingsEvent event,
+    Emitter<PastBookingsState> emit,
+  ) async {
+    emit(PastBookingLoadingState());
+    try {
+      final pastBookings = await _bookingService.get();
+      emit(
+        PastBookingLoadedState(pastBookings: pastBookings),
+      );
+    } catch (e) {
+      emit(
+        PastBookingErrorState(e.toString()),
+      );
+    }
+  }
+}
--- a/lib/features/booking_system/presentation/blocs/past_bookings_bloc/past_bookings_event.dart
+++ b/lib/features/booking_system/presentation/blocs/past_bookings_bloc/past_bookings_event.dart
@ -0,0 +1,10 @@
+part of 'past_bookings_bloc.dart';
+
+sealed class PastBookingsEvent extends Equatable {
+  const PastBookingsEvent();
+
+  @override
+  List<Object> get props => [];
+}
+
+class GetPastBookingsEvent extends PastBookingsEvent {}
--- a/lib/features/booking_system/presentation/blocs/past_bookings_bloc/past_bookings_state.dart
+++ b/lib/features/booking_system/presentation/blocs/past_bookings_bloc/past_bookings_state.dart
@ -0,0 +1,24 @@
+part of 'past_bookings_bloc.dart';
+
+sealed class PastBookingsState extends Equatable {
+  const PastBookingsState();
+
+  @override
+  List<Object> get props => [];
+}
+
+final class PastBookingsInitial extends PastBookingsState {}
+
+final class PastBookingLoadingState extends PastBookingsState {}
+
+final class PastBookingLoadedState extends PastBookingsState {
+  final List<BookingModel> pastBookings;
+  const PastBookingLoadedState({
+    required this.pastBookings,
+  });
+}
+
+final class PastBookingErrorState extends PastBookingsState {
+  final String errorMsg;
+  const PastBookingErrorState(this.errorMsg);
+}
--- a/lib/features/booking_system/presentation/blocs/upcoming_bookings_bloc/upcoming_bookings_bloc.dart
+++ b/lib/features/booking_system/presentation/blocs/upcoming_bookings_bloc/upcoming_bookings_bloc.dart
@ -0,0 +1,32 @@
+import 'package:equatable/equatable.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_app/features/booking_system/domain/booking_model.dart';
+import 'package:syncrow_app/features/booking_system/domain/booking_service.dart';
+
+part 'upcoming_bookings_event.dart';
+part 'upcoming_bookings_state.dart';
+
+class UpcomingBookingsBloc
+    extends Bloc<UpcomingBookingsEvent, UpcomingBookingsState> {
+  final BookingService _bookingService;
+  UpcomingBookingsBloc(this._bookingService)
+      : super(UpcomingBookingsInitial()) {
+    on<GetUpcomingBookingsEvent>(_onGetUpcomingBookingsEvent);
+  }
+  Future<void> _onGetUpcomingBookingsEvent(
+    GetUpcomingBookingsEvent event,
+    Emitter<UpcomingBookingsState> emit,
+  ) async {
+    emit(UpcomingBookingLoadingState());
+    try {
+      final upcomingBookings = await _bookingService.get();
+      emit(
+        UpcomingBookingLoadedState(upcomingBookings: upcomingBookings),
+      );
+    } catch (e) {
+      emit(
+        UpcomingBookingErrorState(e.toString()),
+      );
+    }
+  }
+}
--- a/lib/features/booking_system/presentation/blocs/upcoming_bookings_bloc/upcoming_bookings_event.dart
+++ b/lib/features/booking_system/presentation/blocs/upcoming_bookings_bloc/upcoming_bookings_event.dart
@ -0,0 +1,10 @@
+part of 'upcoming_bookings_bloc.dart';
+
+sealed class UpcomingBookingsEvent extends Equatable {
+  const UpcomingBookingsEvent();
+
+  @override
+  List<Object> get props => [];
+}
+
+class GetUpcomingBookingsEvent extends UpcomingBookingsEvent {}
--- a/lib/features/booking_system/presentation/blocs/upcoming_bookings_bloc/upcoming_bookings_state.dart
+++ b/lib/features/booking_system/presentation/blocs/upcoming_bookings_bloc/upcoming_bookings_state.dart
@ -0,0 +1,24 @@
+part of 'upcoming_bookings_bloc.dart';
+
+sealed class UpcomingBookingsState extends Equatable {
+  const UpcomingBookingsState();
+
+  @override
+  List<Object> get props => [];
+}
+
+final class UpcomingBookingsInitial extends UpcomingBookingsState {}
+
+final class UpcomingBookingLoadingState extends UpcomingBookingsState {}
+
+final class UpcomingBookingLoadedState extends UpcomingBookingsState {
+  final List<BookingModel> upcomingBookings;
+  const UpcomingBookingLoadedState({
+    required this.upcomingBookings,
+  });
+}
+
+final class UpcomingBookingErrorState extends UpcomingBookingsState {
+  final String errorMsg;
+  const UpcomingBookingErrorState(this.errorMsg);
+}
--- a/lib/features/booking_system/presentation/screens/book_page.dart
+++ b/lib/features/booking_system/presentation/screens/book_page.dart
@ -0,0 +1,89 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_app/features/booking_system/presentation/widgets/booking_appbar_widget.dart';
+import 'package:syncrow_app/features/shared_widgets/default_button.dart';
+import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
+import 'package:syncrow_app/utils/helpers/app_size.dart';
+
+import '../../../../utils/resource_manager/color_manager.dart';
+import '../widgets/row_of_title_arrow_widget.dart';
+
+class BookPage extends StatelessWidget {
+  const BookPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return DefaultScaffold(
+      padding: EdgeInsets.zero,
+      appBar: BookingAppBar(),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          SizedBox(
+            height: 20,
+          ),
+          Padding(
+            padding: EdgeInsets.symmetric(horizontal: 10),
+            child: Text(
+              'Booking Details',
+              style: TextStyle(
+                fontSize: 15,
+                color: ColorsManager.grayColor,
+                fontWeight: FontWeight.bold,
+              ),
+            ),
+          ),
+          SizedBox(
+            height: 5,
+          ),
+          Container(
+            padding: EdgeInsets.all(10),
+            height: deviceHeight(context) * 0.25,
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.all(Radius.circular(20)),
+              color: ColorsManager.onPrimaryColor,
+            ),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                RowOfTitleAndArrowWidget(
+                  title: 'Space',
+                  onTap: () {},
+                ),
+                Divider(
+                  color: ColorsManager.grayButtonColors,
+                ),
+                RowOfTitleAndArrowWidget(
+                  title: 'Booking Date',
+                  onTap: () {},
+                ),
+                Divider(
+                  color: ColorsManager.grayButtonColors,
+                ),
+                RowOfTitleAndArrowWidget(
+                  title: 'Time Slot',
+                  onTap: () {},
+                )
+              ],
+            ),
+          ),
+          SizedBox(
+            height: 30,
+          ),
+          Padding(
+            padding: EdgeInsets.symmetric(horizontal: 10),
+            child: DefaultButton(
+              backgroundColor: ColorsManager.blueColor1,
+              child: Text(
+                'Book Now',
+                style: TextStyle(
+                  fontSize: 17,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/lib/features/booking_system/presentation/screens/booking_system_page.dart
+++ b/lib/features/booking_system/presentation/screens/booking_system_page.dart
@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/booking_system/data/booking_dummy_source.dart';
+import 'package:syncrow_app/features/booking_system/presentation/blocs/upcoming_bookings_bloc/upcoming_bookings_bloc.dart';
+import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
+import '../blocs/past_bookings_bloc/past_bookings_bloc.dart';
+import '../widgets/booking_appbar_widget.dart';
+import '../widgets/current_balance_widget.dart';
+import '../widgets/past_booking_widget.dart';
+import '../widgets/upcoming_bookings_widget.dart';
+
+class BookingSystemPage extends StatelessWidget {
+  const BookingSystemPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return MultiBlocProvider(
+        providers: [
+          BlocProvider<UpcomingBookingsBloc>(
+            create: (_) => UpcomingBookingsBloc(BookingDummySource())
+              ..add(GetUpcomingBookingsEvent()),
+          ),
+          BlocProvider<PastBookingsBloc>(
+            create: (_) => PastBookingsBloc(BookingDummySource())
+              ..add(GetPastBookingsEvent()),
+          )
+        ],
+        child: DefaultScaffold(
+          appBar: BookingAppBar(),
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 10),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                SizedBox(
+                  height: 20,
+                ),
+                Expanded(
+                  flex: 2,
+                  child: CurrentBalanceWidget(
+                    userBalance: HomeCubit.user!.points == null
+                        ? '0'
+                        : HomeCubit.user!.points.toString(),
+                  ),
+                ),
+                SizedBox(
+                  height: 20,
+                ),
+                Expanded(
+                  flex: 8,
+                  child: Column(
+                    children: [
+                      UpcomingBookingsWidget(),
+                      SizedBox(
+                        height: 10,
+                      ),
+                      PastBookingsWidget(),
+                    ],
+                  ),
+                )
+              ],
+            ),
+          ),
+        ));
+  }
+}
--- a/lib/features/booking_system/presentation/widgets/booking_appbar_widget.dart
+++ b/lib/features/booking_system/presentation/widgets/booking_appbar_widget.dart
@ -0,0 +1,29 @@
+import 'package:flutter/material.dart';
+
+import '../../../../utils/resource_manager/color_manager.dart';
+
+class BookingAppBar extends StatelessWidget implements PreferredSizeWidget {
+  const BookingAppBar({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return AppBar(
+      backgroundColor: Colors.transparent,
+      centerTitle: true,
+      leading: IconButton(
+          onPressed: () => Navigator.pop(context),
+          icon: Icon(Icons.arrow_back_ios_new)),
+      title: Text(
+        'Booking',
+        style: TextStyle(
+          color: ColorsManager.blueColor1,
+          fontSize: 15,
+          fontWeight: FontWeight.bold,
+        ),
+      ),
+    );
+  }
+
+  @override
+  Size get preferredSize => const Size.fromHeight(kToolbarHeight);
+}
--- a/lib/features/booking_system/presentation/widgets/booking_card_widget.dart
+++ b/lib/features/booking_system/presentation/widgets/booking_card_widget.dart
@ -0,0 +1,105 @@
+import 'package:flutter/material.dart';
+
+import '../../../../utils/resource_manager/color_manager.dart';
+import '../../domain/booking_model.dart';
+
+class BookingCardWidget extends StatelessWidget {
+  const BookingCardWidget({
+    super.key,
+    required this.bookingModel,
+  });
+
+  final BookingModel bookingModel;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: EdgeInsets.all(15),
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.all(Radius.circular(20)),
+        color: ColorsManager.onPrimaryColor,
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            bookingModel.roomName,
+            style: TextStyle(
+              color: ColorsManager.blackColor,
+              fontSize: 17,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          SizedBox(
+            height: 15,
+          ),
+          Text(
+            'Booking Date',
+            style: TextStyle(
+              color: ColorsManager.grayColor,
+              fontSize: 15,
+            ),
+          ),
+          Text(
+            bookingModel.date,
+            style: TextStyle(
+              color: ColorsManager.blackColor,
+              fontSize: 15,
+              fontWeight: FontWeight.w500,
+            ),
+          ),
+          SizedBox(
+            height: 15,
+          ),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.start,
+            children: [
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    'Time slot',
+                    style: TextStyle(
+                      color: ColorsManager.grayColor,
+                      fontSize: 15,
+                    ),
+                  ),
+                  Text(
+                    bookingModel.timeSlot,
+                    style: TextStyle(
+                      color: ColorsManager.blackColor,
+                      fontSize: 15,
+                      fontWeight: FontWeight.w500,
+                    ),
+                  ),
+                ],
+              ),
+              SizedBox(
+                width: 80,
+              ),
+              Column(
+                children: [
+                  Text(
+                    'cost',
+                    style: TextStyle(
+                      color: ColorsManager.grayColor,
+                      fontSize: 15,
+                    ),
+                  ),
+                  Text(
+                    bookingModel.cost.toString(),
+                    style: TextStyle(
+                      color: ColorsManager.blackColor,
+                      fontSize: 15,
+                      fontWeight: FontWeight.w500,
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          )
+        ],
+      ),
+    );
+  }
+}
--- a/lib/features/booking_system/presentation/widgets/current_balance_widget.dart
+++ b/lib/features/booking_system/presentation/widgets/current_balance_widget.dart
@ -0,0 +1,97 @@
+import 'package:flutter/material.dart';
+
+import '../../../../utils/resource_manager/color_manager.dart';
+import '../screens/book_page.dart';
+
+class CurrentBalanceWidget extends StatelessWidget {
+  final String userBalance;
+  const CurrentBalanceWidget({
+    super.key,
+    required this.userBalance,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+          color: ColorsManager.onPrimaryColor,
+          borderRadius: BorderRadius.circular(20)),
+      child: Row(
+        children: [
+          Expanded(
+              flex: 75,
+              child: Padding(
+                padding: EdgeInsets.all(12),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Expanded(
+                        child: Text(
+                      'Current Balance',
+                      style: TextStyle(
+                        color: ColorsManager.blackColor,
+                        fontWeight: FontWeight.bold,
+                        fontSize: 17,
+                      ),
+                    )),
+                    SizedBox(
+                      height: 10,
+                    ),
+                    Expanded(
+                        child: Row(
+                      crossAxisAlignment: CrossAxisAlignment.end,
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      children: [
+                        Text(
+                          userBalance,
+                          style: TextStyle(
+                              color: ColorsManager.blueColor1,
+                              fontWeight: FontWeight.bold,
+                              fontSize: 50),
+                        ),
+                        SizedBox(
+                          width: 5,
+                        ),
+                        Text(
+                          'Points',
+                          style: TextStyle(
+                              color: ColorsManager.blueColor1,
+                              fontWeight: FontWeight.bold,
+                              fontSize: 17),
+                        ),
+                      ],
+                    )),
+                  ],
+                ),
+              )),
+          Expanded(
+            flex: 25,
+            child: InkWell(
+              //TODO:should use custom Navigator
+              onTap: () => Navigator.of(context).push(MaterialPageRoute(
+                builder: (context) => BookPage(),
+              )),
+              child: Container(
+                alignment: Alignment.center,
+                padding: EdgeInsets.only(left: 15),
+                height: double.infinity,
+                decoration: BoxDecoration(
+                  color: ColorsManager.blueColor,
+                  borderRadius:
+                      BorderRadius.horizontal(right: Radius.circular(20)),
+                ),
+                child: Text(
+                  'Book Now',
+                  style: TextStyle(
+                      color: ColorsManager.onPrimaryColor,
+                      fontWeight: FontWeight.bold,
+                      fontSize: 20),
+                ),
+              ),
+            ),
+          )
+        ],
+      ),
+    );
+  }
+}
--- a/lib/features/booking_system/presentation/widgets/past_booking_widget.dart
+++ b/lib/features/booking_system/presentation/widgets/past_booking_widget.dart
@ -0,0 +1,64 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../../../utils/helpers/app_size.dart';
+import '../../../../utils/resource_manager/color_manager.dart';
+import '../../../shared_widgets/default_button.dart';
+import '../blocs/past_bookings_bloc/past_bookings_bloc.dart';
+import 'booking_card_widget.dart';
+
+class PastBookingsWidget extends StatelessWidget {
+  const PastBookingsWidget({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          'Past Bookings',
+          style: TextStyle(
+            fontSize: 15,
+            color: ColorsManager.grayColor,
+            fontWeight: FontWeight.bold,
+          ),
+        ),
+        SizedBox(
+          height: 10,
+        ),
+        BlocBuilder<PastBookingsBloc, PastBookingsState>(
+          builder: (context, state) {
+            if (state is PastBookingLoadingState) {
+              return CircularProgressIndicator();
+            } else if (state is PastBookingErrorState) {
+              return DefaultButton(
+                onPressed: () => context
+                    .read<PastBookingsBloc>()
+                    .add(GetPastBookingsEvent()),
+                child: Text('Try again'),
+              );
+            } else if (state is PastBookingLoadedState) {
+              return SizedBox(
+                height: deviceHeight(context) * 0.3,
+                child: state.pastBookings.isEmpty
+                    ? Text('You Dont Have past Bookings')
+                    : ListView.separated(
+                        separatorBuilder: (context, index) => SizedBox(
+                          height: 10,
+                        ),
+                        itemCount: state.pastBookings.length,
+                        itemBuilder: (context, index) {
+                          final pastBooking = state.pastBookings[index];
+                          return BookingCardWidget(bookingModel: pastBooking);
+                        },
+                      ),
+              );
+            } else {
+              return SizedBox();
+            }
+          },
+        )
+      ],
+    );
+  }
+}
--- a/lib/features/booking_system/presentation/widgets/row_of_title_arrow_widget.dart
+++ b/lib/features/booking_system/presentation/widgets/row_of_title_arrow_widget.dart
@ -0,0 +1,40 @@
+import 'package:flutter/material.dart';
+
+import '../../../../utils/resource_manager/color_manager.dart';
+
+class RowOfTitleAndArrowWidget extends StatelessWidget {
+  final String title;
+  final void Function() onTap;
+  const RowOfTitleAndArrowWidget({
+    super.key,
+    required this.title,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        Padding(
+          padding: EdgeInsets.all(10),
+          child: Text(
+            title,
+            style: TextStyle(
+              fontSize: 17,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+        ),
+        IconButton(
+          onPressed: onTap,
+          icon: Icon(
+            Icons.arrow_forward_ios,
+            color: ColorsManager.grayColor,
+            size: 15,
+          ),
+        )
+      ],
+    );
+  }
+}
--- a/lib/features/booking_system/presentation/widgets/upcoming_bookings_widget.dart
+++ b/lib/features/booking_system/presentation/widgets/upcoming_bookings_widget.dart
@ -0,0 +1,66 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../../../utils/helpers/app_size.dart';
+import '../../../../utils/resource_manager/color_manager.dart';
+import '../../../shared_widgets/default_button.dart';
+import '../blocs/upcoming_bookings_bloc/upcoming_bookings_bloc.dart';
+import 'booking_card_widget.dart';
+
+class UpcomingBookingsWidget extends StatelessWidget {
+  const UpcomingBookingsWidget({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          'Upcoming Bookings',
+          style: TextStyle(
+            fontSize: 15,
+            color: ColorsManager.grayColor,
+            fontWeight: FontWeight.bold,
+          ),
+        ),
+        SizedBox(
+          height: 10,
+        ),
+        BlocBuilder<UpcomingBookingsBloc, UpcomingBookingsState>(
+          builder: (context, state) {
+            if (state is UpcomingBookingLoadingState) {
+              //TODO:should use CustomLoadingWidget
+              return CircularProgressIndicator();
+            } else if (state is UpcomingBookingErrorState) {
+//TODO:shold use CustomErrorWidget
+              return DefaultButton(
+                onPressed: () => context
+                    .read<UpcomingBookingsBloc>()
+                    .add(GetUpcomingBookingsEvent()),
+                child: Text('Try again'),
+              );
+            } else if (state is UpcomingBookingLoadedState) {
+              return SizedBox(
+                height: deviceHeight(context) * 0.3,
+                child: state.upcomingBookings.isEmpty
+                    ? Text('You Dont Have Upcoming Bookings')
+                    : ListView.separated(
+                        separatorBuilder: (context, index) => SizedBox(
+                          height: 10,
+                        ),
+                        itemCount: state.upcomingBookings.length,
+                        itemBuilder: (context, index) {
+                          final upcomingBooking = state.upcomingBookings[index];
+                          return BookingCardWidget(
+                              bookingModel: upcomingBooking);
+                        },
+                      ),
+              );
+            } else {
+              return SizedBox();
+            }
+          },
+        )
+      ],
+    );
+  }
+}
--- a/lib/features/devices/bloc/smart_door_bloc/smart_door_bloc.dart
+++ b/lib/features/devices/bloc/smart_door_bloc/smart_door_bloc.dart
@ -149,7 +149,6 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
    _streamSubscription = null;
    return super.close();
  }
- 

  _doorLockUpdated(DoorLockUpdated event, Emitter<SmartDoorState> emit) {
    unlockRequest = deviceStatus.unlockRequest;
@ -254,18 +253,42 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
  }

  void _updateLock(UpdateLockEvent event, Emitter<SmartDoorState> emit) async {
-    emit(LoadingNewSate(smartDoorModel: deviceStatus));
+    final oldValue = deviceStatus.normalOpenSwitch;
+    deviceStatus = deviceStatus.copyWith(normalOpenSwitch: !oldValue);
+    emit(UpdateState(smartDoorModel: deviceStatus));
    try {
-      // final response = await DevicesAPI.controlDevice(
-      //     DeviceControlModel(deviceId: deviceId, code: 'normal_open_switch', value: !event.value),
-      //     deviceId);
-
      final response = await DevicesAPI.openDoorLock(deviceId);

-      if (response) {
-        deviceStatus.normalOpenSwitch = !event.value;
+      if (!response) {
+        _revertValueAndEmit(deviceId, 'normal_open_switch', oldValue, emit);
      }
-    } catch (_) {}
+    } catch (_) {
+      _revertValueAndEmit(deviceId, 'normal_open_switch', oldValue, emit);
+    }
+  }
+
+  void _revertValueAndEmit(String deviceId, String code, dynamic oldValue,
+      Emitter<SmartDoorState> emit) {
+    _updateLocalValue(code, oldValue);
+    emit(UpdateState(smartDoorModel: deviceStatus));
+    emit(const FailedState(errorMessage: 'Failed to control the device.'));
+  }
+
+  void _updateLocalValue(String code, dynamic value) {
+    switch (code) {
+      case 'normal_open_switch':
+        if (value is bool) {
+          deviceStatus = deviceStatus.copyWith(normalOpenSwitch: value);
+        }
+        break;
+      case 'reverse_lock':
+        if (value is bool) {
+          deviceStatus = deviceStatus.copyWith(reverseLock: value);
+        }
+        break;
+      default:
+        break;
+    }
    emit(UpdateState(smartDoorModel: deviceStatus));
  }

@ -331,6 +354,7 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {

  Future<void> selectTimeOnlinePassword(
      SelectTimeOnlinePasswordEvent event, Emitter<SmartDoorState> emit) async {
+    effectiveTimeTimeStamp ??= DateTime.now().millisecondsSinceEpoch ~/ 1000;
    emit(ChangeTimeState());
    final DateTime? picked = await showDatePicker(
      context: event.context,
@ -375,7 +399,13 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
              selectedDateTime.minute,
            ).millisecondsSinceEpoch ~/
            1000; // Divide by 1000 to remove milliseconds
+        final currentTimestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;
        if (event.isEffective) {
+          if (selectedTimestamp < currentTimestamp) {
+            CustomSnackBar.displaySnackBar(
+                'Effective Time cannot be later than Expiration Time.');
+            return;
+          }
          if (expirationTimeTimeStamp != null &&
              selectedTimestamp > expirationTimeTimeStamp!) {
            CustomSnackBar.displaySnackBar(
--- a/lib/features/devices/model/smart_door_model.dart
+++ b/lib/features/devices/model/smart_door_model.dart
@ -113,4 +113,44 @@ class SmartDoorModel {
        remoteNoDpKey: _remoteNoDpKey,
        normalOpenSwitch: _normalOpenSwitch);
  }
+  SmartDoorModel copyWith({
+    String? uuid,
+    int? unlockFingerprint,
+    int? unlockPassword,
+    int? unlockTemporary,
+    int? unlockCard,
+    String? alarmLock,
+    int? unlockRequest,
+    int? residualElectricity,
+    bool? reverseLock,
+    int? unlockApp,
+    bool? hijack,
+    bool? doorbell,
+    String? unlockOfflinePd,
+    String? unlockOfflineClear,
+    String? unlockDoubleKit,
+    String? remoteNoPdSetkey,
+    String? remoteNoDpKey,
+    bool? normalOpenSwitch,
+  }) {
+    return SmartDoorModel(
+      unlockAlarm: alarmLock ?? unlockAlarm,
+      unlockFingerprint: unlockFingerprint ?? this.unlockFingerprint,
+      unlockPassword: unlockPassword ?? this.unlockPassword,
+      unlockTemporary: unlockTemporary ?? this.unlockTemporary,
+      unlockCard: unlockCard ?? this.unlockCard,
+      unlockRequest: unlockRequest ?? this.unlockRequest,
+      residualElectricity: residualElectricity ?? this.residualElectricity,
+      reverseLock: reverseLock ?? this.reverseLock,
+      unlockApp: unlockApp ?? this.unlockApp,
+      hijack: hijack ?? this.hijack,
+      doorbell: doorbell ?? this.doorbell,
+      unlockOfflinePd: unlockOfflinePd ?? this.unlockOfflinePd,
+      unlockOfflineClear: unlockOfflineClear ?? this.unlockOfflineClear,
+      unlockDoubleKit: unlockDoubleKit ?? this.unlockDoubleKit,
+      remoteNoPdSetkey: remoteNoPdSetkey ?? this.remoteNoPdSetkey,
+      remoteNoDpKey: remoteNoDpKey ?? this.remoteNoDpKey,
+      normalOpenSwitch: normalOpenSwitch ?? this.normalOpenSwitch,
+    );
+  }
 }
--- a/lib/features/devices/view/widgets/flush_sensor/flush_sensor_interface.dart
+++ b/lib/features/devices/view/widgets/flush_sensor/flush_sensor_interface.dart
@ -70,7 +70,7 @@ class FlushMountedInterface extends StatelessWidget {
                              SettingsPage(device: deviceModel),
                        ),
                      );
-                      if (val == null) {
+                      if (val == null || val == true) {
                        bloc.add(FlushSensorInitialDeviceInfo());
                        bloc.add(FlushSensorInitialEvent());
                      }
--- a/lib/features/devices/view/widgets/name_time_widget.dart
+++ b/lib/features/devices/view/widgets/name_time_widget.dart
@ -11,6 +11,9 @@ class NameTimeWidget extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    DateTime now = DateTime.now();
+    DateTime cleaned =
+        DateTime(now.year, now.month, now.day, now.hour, now.minute);
    return DefaultContainer(
        padding: const EdgeInsets.all(20),
        child: Column(
@ -59,19 +62,22 @@ class NameTimeWidget extends StatelessWidget {
                          width: MediaQuery.of(context).size.width / 3.5,
                          child: InkWell(
                            onTap: () {
-
-                              BlocProvider.of<SmartDoorBloc>(context).add(SelectTimeOnlinePasswordEvent(context: context, isEffective: true));
+                              BlocProvider.of<SmartDoorBloc>(context).add(
+                                  SelectTimeOnlinePasswordEvent(
+                                      context: context, isEffective: true));
                            },
                            child: Text(
-                              BlocProvider.of<SmartDoorBloc>(context).effectiveTime,
-                              style: TextStyle(fontSize: 14,
-                                  color: BlocProvider.of<SmartDoorBloc>(context).effectiveTime ==
+                              BlocProvider.of<SmartDoorBloc>(context)
+                                          .effectiveTime ==
                                      'Select Time'
-                                      ? ColorsManager.textGray
-                                      : null),
+                                  ? cleaned.toString()
+                                  : BlocProvider.of<SmartDoorBloc>(context)
+                                      .effectiveTime,
+                              style: TextStyle(fontSize: 14),
                            ),
                          )),
-                    ],),
+                    ],
+                  ),
                ),
                const Divider(
                  color: ColorsManager.graysColor,
@ -96,10 +102,13 @@ class NameTimeWidget extends StatelessWidget {
                                    context: context, isEffective: false));
                          },
                          child: Text(
-                            BlocProvider.of<SmartDoorBloc>(context).expirationTime,
+                            BlocProvider.of<SmartDoorBloc>(context)
+                                .expirationTime,
                            style: TextStyle(
                                fontSize: 14,
-                                color: BlocProvider.of<SmartDoorBloc>(context).expirationTime == 'Select Time'
+                                color: BlocProvider.of<SmartDoorBloc>(context)
+                                            .expirationTime ==
+                                        'Select Time'
                                    ? ColorsManager.textGray
                                    : null),
                          ),
--- a/lib/features/devices/view/widgets/power_clamp/power_chart.dart
+++ b/lib/features/devices/view/widgets/power_clamp/power_chart.dart
@ -44,7 +44,7 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
                      },
                      touchTooltipData: LineTouchTooltipData(
                        getTooltipColor: (touchTooltipItem) => Colors.white,
-                        tooltipRoundedRadius: 10.0,
+                        tooltipBorderRadius: BorderRadius.circular(10.0),
                        tooltipPadding: const EdgeInsets.all(8.0),
                        tooltipBorder: BorderSide(color: Colors.grey, width: 1),
                        getTooltipItems: (List<LineBarSpot> touchedSpots) {
--- a/lib/features/devices/view/widgets/smart_door/door_button.dart
+++ b/lib/features/devices/view/widgets/smart_door/door_button.dart
@ -6,10 +6,9 @@ import 'package:syncrow_app/features/devices/bloc/smart_door_bloc/smart_door_eve
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/devices/model/smart_door_model.dart';
 import 'package:syncrow_app/generated/assets.dart';
-import 'package:syncrow_app/utils/context_extension.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';

-class DoorLockButton extends StatefulWidget {
+class DoorLockButton extends StatelessWidget {
  const DoorLockButton({
    super.key,
    required this.doorLock,
@ -18,157 +17,79 @@ class DoorLockButton extends StatefulWidget {

  final DeviceModel doorLock;
  final SmartDoorModel smartDoorModel;
-  @override
-  State<DoorLockButton> createState() => _DoorLockButtonState(smartDoorModel: smartDoorModel);
-}

-class _DoorLockButtonState extends State<DoorLockButton> with SingleTickerProviderStateMixin {
-  late AnimationController _animationController;
-  late Animation<double> _animation;
-  SmartDoorModel smartDoorModel;
-  _DoorLockButtonState({required this.smartDoorModel});
-
-  @override
-  void initState() {
-    super.initState();
-
-    _animationController = AnimationController(
-      vsync: this,
-      value: context.read<SmartDoorBloc>().unlockRequest > 0 ? 1 : 0,
-      duration: Duration(seconds: context.read<SmartDoorBloc>().unlockRequest),
-    );
-    if (context.read<SmartDoorBloc>().unlockRequest > 0) {
-      _animationController.reverse();
-    }
-
-    _animation = Tween<double>(begin: 0, end: 1).animate(_animationController)
-      ..addListener(() {
-        setState(() {});
-      });
-  }
-
-  @override
-  void didUpdateWidget(DoorLockButton oldWidget) {
-    super.didUpdateWidget(oldWidget);
-
-    if (_animationController.status == AnimationStatus.dismissed) {
-      if (context.read<SmartDoorBloc>().unlockRequest > 0) {
-        _animationController.value = 1;
-        _animationController.duration =
-            Duration(seconds: context.read<SmartDoorBloc>().unlockRequest);
-        _animationController.reverse();
-      }
-    }
-  }
-
-  @override
-  void dispose() {
-    _animationController.dispose();
-    super.dispose();
+  double _calculateProgress() {
+    final value = smartDoorModel.unlockRequest;
+    if (value <= 0 || value > 30) return 0;
+    return value / 30.0;
  }

  @override
  Widget build(BuildContext context) {
-    return Padding(
-      padding: EdgeInsets.only(
-        right: context.width * 0.25 / 2,
-        left: context.width * 0.25 / 2,
-        bottom: context.width * 0.2 / 2,
-      ),
+    final progress = _calculateProgress();
+    final isEnabled = smartDoorModel.unlockRequest > 0;
+
+    return SizedBox(
+      width: 255,
+      height: 255,
      child: InkWell(
-        overlayColor:
-            WidgetStateProperty.all(ColorsManager.primaryColorWithOpacity.withOpacity(0.1)),
-        borderRadius: BorderRadius.circular(999),
-        onTapDown: (details) {
-          // if (_animationController.status == AnimationStatus.dismissed) {
-          //   _animationController.forward();
-          // } else if (_animationController.status == AnimationStatus.completed) {
-          //   _animationController.reverse();
-          // } else if (_animationController.status == AnimationStatus.forward) {
-          //   _animationController.reverse();
-          // } else if (_animationController.status == AnimationStatus.reverse) {
-          //   _animationController.forward();
-          // }
-          if (context.read<SmartDoorBloc>().unlockRequest > 0) {
-            BlocProvider.of<SmartDoorBloc>(context)
-                .add(UpdateLockEvent(value: smartDoorModel.normalOpenSwitch));
-          }
-        },
-        onTapUp: (details) {
-          // if (_animationController.status == AnimationStatus.forward) {
-          //   _animationController.reverse();
-          // } else if (_animationController.status == AnimationStatus.reverse) {
-          //   _animationController.forward();
-          // }
-        },
+        onTap: isEnabled
+            ? () {
+                BlocProvider.of<SmartDoorBloc>(context).add(
+                  UpdateLockEvent(value: !smartDoorModel.normalOpenSwitch),
+                );
+              }
+            : null,
        child: Container(
-          width: context.width * 06,
-          height: context.width * 0.6,
-          margin: const EdgeInsets.all(10),
-          decoration: const BoxDecoration(
+          width: 255,
+          height: 255,
+          decoration: BoxDecoration(
+            color: const Color(0xFFEBECED),
+            shape: BoxShape.circle,
            boxShadow: [
              BoxShadow(
-                color: Colors.grey,
+                color: Colors.grey.withOpacity(0.5),
                blurRadius: 18,
-                // offset: Offset(6, 7),
                blurStyle: BlurStyle.outer,
              ),
            ],
-            color: Color(0xFFEBECED),
-            borderRadius: BorderRadius.all(Radius.circular(999)),
          ),
-          child: Padding(
-            padding: const EdgeInsets.all(25),
-            child: Stack(
-              alignment: Alignment.center,
-              children: [
-                Container(
-                  margin: const EdgeInsets.all(8),
-                  decoration: BoxDecoration(
-                    color: Colors.white,
-                    borderRadius: BorderRadius.circular(999),
-                    boxShadow: [
-                      BoxShadow(
-                        color: Colors.white.withOpacity(0.5),
-                        blurRadius: 30,
-                        offset: const Offset(-5, -5),
-                        blurStyle: BlurStyle.outer,
-                      ),
-                      BoxShadow(
-                        color: Colors.black.withOpacity(0.14),
-                        blurRadius: 25,
-                        offset: const Offset(5, 5),
-                        blurStyle: BlurStyle.outer,
-                      ),
-                      BoxShadow(
-                        color: Colors.black.withOpacity(0.14),
-                        blurRadius: 30,
-                        offset: const Offset(5, 5),
-                        blurStyle: BlurStyle.inner,
-                      ),
-                    ],
-                  ),
-                  child: Center(
-                    child: SvgPicture.asset(
-                      smartDoorModel.normalOpenSwitch
-                          ? Assets.doorUnlockIcon
-                          : Assets.assetsIconsDoorlockAssetsLockIcon,
-                    ),
+          child: Stack(
+            alignment: Alignment.center,
+            children: [
+              Container(
+                margin: const EdgeInsets.all(30),
+                decoration: const BoxDecoration(
+                  color: Color(0xFFF9F9F9),
+                  shape: BoxShape.circle,
+                ),
+                child: Center(
+                  child: SvgPicture.asset(
+                    smartDoorModel.normalOpenSwitch
+                        ? Assets.doorUnlockIcon
+                        : Assets.assetsIconsDoorlockAssetsLockIcon,
+                    width: 60,
+                    height: 60,
                  ),
                ),
-                SizedBox.expand(
+              ),
+              if (progress > 0)
+                Container(
+                  decoration: BoxDecoration(shape: BoxShape.circle),
+                  height: 250,
+                  width: 250,
                  child: CircularProgressIndicator(
-                    value: _animation.value,
-                    strokeWidth: 15,
+                    value: progress,
+                    strokeWidth: 8,
                    backgroundColor: Colors.transparent,
-                    valueColor: const AlwaysStoppedAnimation<Color>(ColorsManager.primaryColor),
+                    valueColor: const AlwaysStoppedAnimation<Color>(
+                        ColorsManager.primaryColor),
                  ),
-                )
-              ],
-            ),
+                ),
+            ],
          ),
        ),
      ),
    );
  }
-}
+}
--- a/lib/features/devices/view/widgets/smart_door/offline_timeLimit_password_page.dart
+++ b/lib/features/devices/view/widgets/smart_door/offline_timeLimit_password_page.dart
@ -18,7 +18,8 @@ import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
 class CreateOfflineTimeLimitPasswordPage extends StatelessWidget {
  final String? deviceId;
  final String? type;
-  const CreateOfflineTimeLimitPasswordPage({super.key, this.deviceId, this.type});
+  const CreateOfflineTimeLimitPasswordPage(
+      {super.key, this.deviceId, this.type});
  @override
  Widget build(BuildContext context) {
    bool isRepeat = false;
@ -28,9 +29,7 @@ class CreateOfflineTimeLimitPasswordPage extends StatelessWidget {
        child: BlocConsumer<SmartDoorBloc, SmartDoorState>(
            listener: (context, state) {
          if (state is FailedState) {
-            CustomSnackBar.displaySnackBar(
-                state.errorMessage
-            );
+            CustomSnackBar.displaySnackBar(state.errorMessage);
          }
          if (state is IsRepeatState) {
            isRepeat = state.repeat;
@ -39,6 +38,10 @@ class CreateOfflineTimeLimitPasswordPage extends StatelessWidget {
            generated = state.generated;
          }
        }, builder: (context, state) {
+          DateTime now = DateTime.now();
+          DateTime cleaned =
+              DateTime(now.year, now.month, now.day, now.hour, now.minute);
+
          final smartDoorBloc = BlocProvider.of<SmartDoorBloc>(context);
          return DefaultScaffold(
            appBar: AppBar(
@ -85,46 +88,56 @@ class CreateOfflineTimeLimitPasswordPage extends StatelessWidget {
                                  Flexible(
                                      child: Row(
                                    mainAxisAlignment: MainAxisAlignment.center,
-                                    children: smartDoorBloc.passwordController.text.isEmpty ?
-                                    List.generate(10, (index) {
-                                       return const Padding(
-                                         padding: EdgeInsets.symmetric(
-                                             horizontal: 4.0,
-                                             vertical: 15),
-                                         child: Icon(
-                                           Icons.circle,
-                                           size: 20.0,
-                                           color: Colors.black,
-                                         ),
-                                       );
-                                    }) : [
-                                      Expanded(
-                                        child: Row(
-                                          children: [
+                                    children: smartDoorBloc
+                                            .passwordController.text.isEmpty
+                                        ? List.generate(10, (index) {
+                                            return const Padding(
+                                              padding: EdgeInsets.symmetric(
+                                                  horizontal: 4.0,
+                                                  vertical: 15),
+                                              child: Icon(
+                                                Icons.circle,
+                                                size: 20.0,
+                                                color: Colors.black,
+                                              ),
+                                            );
+                                          })
+                                        : [
                                            Expanded(
-                                              child: BodyLarge(
-                                                style: const TextStyle(
-                                                    color: ColorsManager.primaryColor,
-                                                    fontWeight: FontWeight.bold,
-                                                    letterSpacing: 8.0,
-                                                    fontSize: 25,
-                                                    wordSpacing: 2),
-                                                textAlign: TextAlign.center,
-                                                text: smartDoorBloc.passwordController.text,
-                                                fontSize: 25,
+                                              child: Row(
+                                                children: [
+                                                  Expanded(
+                                                    child: BodyLarge(
+                                                      style: const TextStyle(
+                                                          color: ColorsManager
+                                                              .primaryColor,
+                                                          fontWeight:
+                                                              FontWeight.bold,
+                                                          letterSpacing: 8.0,
+                                                          fontSize: 25,
+                                                          wordSpacing: 2),
+                                                      textAlign:
+                                                          TextAlign.center,
+                                                      text: smartDoorBloc
+                                                          .passwordController
+                                                          .text,
+                                                      fontSize: 25,
+                                                    ),
+                                                  ),
+                                                  IconButton(
+                                                      onPressed: () async {
+                                                        await Clipboard.setData(
+                                                            ClipboardData(
+                                                                text: smartDoorBloc
+                                                                    .passwordController
+                                                                    .text));
+                                                      },
+                                                      icon: const Icon(
+                                                          Icons.copy)),
+                                                ],
                                              ),
                                            ),
-                                            IconButton(
-                                                onPressed: () async {
-                                                  await Clipboard.setData(
-                                                      ClipboardData(text: smartDoorBloc.passwordController.text)
-                                                  );
-                                               },
-                                                icon: const Icon(Icons.copy)),
                                          ],
-                                        ),
-                                      ),
-                                    ],
                                  )),
                                  const SizedBox(
                                    width: 10,
@ -135,91 +148,142 @@ class CreateOfflineTimeLimitPasswordPage extends StatelessWidget {
                                  padding: const EdgeInsets.all(20),
                                  child: Column(
                                    children: [
-                               Row(
-                                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                 children: [
-                                   Expanded(
-                                     child: Container(
-                                       padding: const EdgeInsets.all(10.0),
-                                       child: const BodyMedium(
-                                         text: 'Password Name',
-                                         fontWeight: FontWeight.normal,
-                                         ),
-                                     ),
-                                  ),
-                              SizedBox(
-                                  width: MediaQuery.of(context).size.width / 2.6,
-                                  child: TextFormField(
-                                    controller: BlocProvider.of<SmartDoorBloc>(context).passwordNameController,
-                                    decoration:
-                                    const InputDecoration(
-                                        hintText: 'Enter The Name',
-                                        hintStyle: TextStyle(
-                                            fontSize: 14,
-                                            color: ColorsManager.textGray)
-                                    ),
-                                  )),
-                                ],
-                               ),
-                             Column(
-                               children: [
-                                 const Divider(color: ColorsManager.graysColor,),
-                                 Padding(
-                                   padding: const EdgeInsets.all(10.0),
-                                   child: Row(
-                                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                     children: [
-                                       const Expanded(
-                                         child: BodyMedium(
-                                           text: 'Effective Time',
-                                           fontWeight: FontWeight.normal,
+                                      Row(
+                                        mainAxisAlignment:
+                                            MainAxisAlignment.spaceBetween,
+                                        children: [
+                                          Expanded(
+                                            child: Container(
+                                              padding:
+                                                  const EdgeInsets.all(10.0),
+                                              child: const BodyMedium(
+                                                text: 'Password Name',
+                                                fontWeight: FontWeight.normal,
+                                              ),
+                                            ),
                                          ),
-                                         ),
-                                    SizedBox(
-                                     width: MediaQuery.of(context).size.width / 3.5,
-                                     child: InkWell(
-                                       onTap: () {
-                                         BlocProvider.of<SmartDoorBloc>(context).add(SelectTimeEvent(context: context, isEffective: true));
-                                         },
-                                       child: Text(
-                                         BlocProvider.of<SmartDoorBloc>(context).effectiveTime,
-                                         style: TextStyle(
-                                             fontSize: 14,
-                                             color: BlocProvider.of<SmartDoorBloc>(context).effectiveTime ==
-                                             'Select Time' ? ColorsManager.textGray : null),
-                                       ),
-                                     )),],
-                                   ),
-                                  ),
-                         const Divider(
-                           color: ColorsManager.graysColor,
-                           ),
-                                 Padding(
-                                   padding: const EdgeInsets.all(10.0),
-                                   child: Row(mainAxisAlignment:
-                                   MainAxisAlignment.spaceBetween,
-                                     children: [
-                                       const Expanded(
-                                         child: BodyMedium(
-                                           text: 'Expiration Time',
-                                           fontWeight: FontWeight.normal,
-                                         ),
-                                       ),
-                                       SizedBox(
-                                         width: MediaQuery.of(context).size.width / 3.5,
-                                         child: InkWell(
-                                           onTap: () {
-                                             BlocProvider.of<SmartDoorBloc>(context).add(SelectTimeEvent(
-                                                 context: context,
-                                                 isEffective: false));
-                                             },
-                                           child: Text(
-                                             BlocProvider.of<SmartDoorBloc>(context).expirationTime,
-                                             style: TextStyle(
-                                                 fontSize: 14,
-                                                 color: BlocProvider.of<SmartDoorBloc>(context)
-                                                     .expirationTime == 'Select Time' ? ColorsManager
-                                                     .textGray : null),
+                                          SizedBox(
+                                              width: MediaQuery.of(context)
+                                                      .size
+                                                      .width /
+                                                  2.6,
+                                              child: TextFormField(
+                                                controller: BlocProvider.of<
+                                                        SmartDoorBloc>(context)
+                                                    .passwordNameController,
+                                                decoration:
+                                                    const InputDecoration(
+                                                        hintText:
+                                                            'Enter The Name',
+                                                        hintStyle: TextStyle(
+                                                            fontSize: 14,
+                                                            color: ColorsManager
+                                                                .textGray)),
+                                              )),
+                                        ],
+                                      ),
+                                      Column(
+                                        children: [
+                                          const Divider(
+                                            color: ColorsManager.graysColor,
+                                          ),
+                                          Padding(
+                                            padding: const EdgeInsets.all(10.0),
+                                            child: Row(
+                                              mainAxisAlignment:
+                                                  MainAxisAlignment
+                                                      .spaceBetween,
+                                              children: [
+                                                const Expanded(
+                                                  child: BodyMedium(
+                                                    text: 'Effective Time',
+                                                    fontWeight:
+                                                        FontWeight.normal,
+                                                  ),
+                                                ),
+                                                SizedBox(
+                                                    width:
+                                                        MediaQuery.of(context)
+                                                                .size
+                                                                .width /
+                                                            3.5,
+                                                    child: InkWell(
+                                                      onTap: () {
+                                                        BlocProvider.of<
+                                                                    SmartDoorBloc>(
+                                                                context)
+                                                            .add(
+                                                                SelectTimeEvent(
+                                                                    context:
+                                                                        context,
+                                                                    isEffective:
+                                                                        true));
+                                                      },
+                                                      child: Text(
+                                                        BlocProvider.of<SmartDoorBloc>(
+                                                                        context)
+                                                                    .effectiveTime ==
+                                                                'Select Time'
+                                                            ? cleaned.toString()
+                                                            : BlocProvider.of<
+                                                                        SmartDoorBloc>(
+                                                                    context)
+                                                                .effectiveTime,
+                                                        style: TextStyle(
+                                                          fontSize: 14,
+                                                        ),
+                                                      ),
+                                                    )),
+                                              ],
+                                            ),
+                                          ),
+                                          const Divider(
+                                            color: ColorsManager.graysColor,
+                                          ),
+                                          Padding(
+                                            padding: const EdgeInsets.all(10.0),
+                                            child: Row(
+                                              mainAxisAlignment:
+                                                  MainAxisAlignment
+                                                      .spaceBetween,
+                                              children: [
+                                                const Expanded(
+                                                  child: BodyMedium(
+                                                    text: 'Expiration Time',
+                                                    fontWeight:
+                                                        FontWeight.normal,
+                                                  ),
+                                                ),
+                                                SizedBox(
+                                                  width: MediaQuery.of(context)
+                                                          .size
+                                                          .width /
+                                                      3.5,
+                                                  child: InkWell(
+                                                    onTap: () {
+                                                      BlocProvider.of<
+                                                                  SmartDoorBloc>(
+                                                              context)
+                                                          .add(SelectTimeEvent(
+                                                              context: context,
+                                                              isEffective:
+                                                                  false));
+                                                    },
+                                                    child: Text(
+                                                      BlocProvider.of<
+                                                                  SmartDoorBloc>(
+                                                              context)
+                                                          .expirationTime,
+                                                      style: TextStyle(
+                                                          fontSize: 14,
+                                                          color: BlocProvider.of<
+                                                                              SmartDoorBloc>(
+                                                                          context)
+                                                                      .expirationTime ==
+                                                                  'Select Time'
+                                                              ? ColorsManager
+                                                                  .textGray
+                                                              : null),
                                                    ),
                                                  ),
                                                ),
@ -238,7 +302,8 @@ class CreateOfflineTimeLimitPasswordPage extends StatelessWidget {
                        ),
                        const BodyMedium(
                          textAlign: TextAlign.center,
-                          text: 'Use the time-limited password at least once within 24 hours after the password takes effect. Otherwise, the password becomes invalid.',
+                          text:
+                              'Use the time-limited password at least once within 24 hours after the password takes effect. Otherwise, the password becomes invalid.',
                          fontWeight: FontWeight.normal,
                          fontColor: ColorsManager.grayColor,
                        ),
@ -256,10 +321,13 @@ class CreateOfflineTimeLimitPasswordPage extends StatelessWidget {
                              backgroundColor: ColorsManager.primaryColor,
                              onPressed: () async {
                                if (generated == false) {
-                                  smartDoorBloc.add(GenerateAndSavePasswordTimeLimitEvent(context: context));
+                                  smartDoorBloc.add(
+                                      GenerateAndSavePasswordTimeLimitEvent(
+                                          context: context));
                                } else {
-                                  if(smartDoorBloc.passwordNameController.text.isNotEmpty){
-                                  smartDoorBloc.add(RenamePasswordEvent());
+                                  if (smartDoorBloc
+                                      .passwordNameController.text.isNotEmpty) {
+                                    smartDoorBloc.add(RenamePasswordEvent());
                                  }
                                  Navigator.of(context).pop(true);
                                }
--- a/lib/features/menu/bloc/menu_cubit.dart
+++ b/lib/features/menu/bloc/menu_cubit.dart
@ -2,6 +2,7 @@ import 'dart:ui';

 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/booking_system/presentation/screens/booking_system_page.dart';
 import 'package:syncrow_app/features/menu/bloc/privacy_policy.dart';
 import 'package:syncrow_app/features/menu/bloc/user_agreement.dart';
 import 'package:syncrow_app/features/menu/view/widgets/join_home/join_home_view.dart';
@ -44,6 +45,18 @@ class MenuCubit extends Cubit<MenuState> {
  }

  List<Map<String, Object>> menuSections = [
+//Booking System
+    {
+      'title': 'Booking System',
+      'color': const Color(0xFF8AB9FF),
+      'buttons': [
+        {
+          'title': 'Booking',
+          'Icon': Assets.assetsIconsMenuBookingSystem,
+          'page': BookingSystemPage()
+        },
+      ],
+    },
    //Home Management
    {
      'title': 'Home Management',
--- a/lib/features/menu/view/widgets/manage_home/manage_home_view.dart
+++ b/lib/features/menu/view/widgets/manage_home/manage_home_view.dart
@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/app_layout/model/community_model.dart';
 import 'package:syncrow_app/features/menu/view/widgets/manage_home/home_settings.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
 import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
@ -15,29 +16,37 @@ class ManageHomeView extends StatelessWidget {
  Widget build(BuildContext context) {
    var spaces = HomeCubit.getInstance().spaces;
    return DefaultScaffold(
-        title: 'Manage Your Home',
-        height: MediaQuery.sizeOf(context).height,
+      title: 'Manage Your Home',
+      child: Align(
+        alignment: Alignment.topCenter,
        child: spaces.isEmpty
-            ? const Center(
-                child: BodyMedium(text: 'No spaces found'),
-              )
+            ? const Center(child: BodyMedium(text: 'No spaces found'))
            : DefaultContainer(
-                padding: EdgeInsets.symmetric(horizontal: 20, vertical: 25),
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 20, vertical: 25),
                child: ListView.builder(
-                    itemCount: spaces.length,
-                    itemBuilder: (context, index) {
-                      if (index == spaces.length - 1) {
-                        return InkWell(
-                          onTap: () {
-                            Navigator.of(context).push(CustomPageRoute(
-                                builder: (context) => HomeSettingsView(
-                                      space: spaces[index],
-                                    )));
-                          },
-                          child: Row(
+                  shrinkWrap: true,
+                  itemCount: spaces.length,
+                  itemBuilder: (context, index) {
+                    final space = spaces[index];
+                    return InkWell(
+                      onTap: () {
+                        Navigator.of(context).push(
+                          CustomPageRoute(
+                            builder: (context) =>
+                                HomeSettingsView(space: space),
+                          ),
+                        );
+                      },
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Row(
                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
                            children: [
-                              BodyMedium(text: StringHelpers.toTitleCase(spaces[index].name)),
+                              BodyMedium(
+                                  text: StringHelpers.toTitleCase(space.name)),
                              const Icon(
                                Icons.arrow_forward_ios,
                                color: ColorsManager.greyColor,
@ -45,45 +54,19 @@ class ManageHomeView extends StatelessWidget {
                              )
                            ],
                          ),
-                        );
-                      }
-                      return InkWell(
-                        onTap: () {
-                          //TODO refactor the routing to use named routes
-                          // Navigator.of(context).pushNamed(
-                          //   '/home_settings',
-                          //   arguments: spaces[index],
-                          // );
-
-                          Navigator.of(context).push(CustomPageRoute(
-                              builder: (context) => HomeSettingsView(
-                                    space: spaces[index],
-                                  )));
-                        },
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              children: [
-                                BodyMedium(text: HomeCubit.getInstance().spaces[index].name),
-                                const Icon(
-                                  Icons.arrow_forward_ios,
-                                  color: ColorsManager.greyColor,
-                                  size: 15,
-                                )
-                              ],
-                            ),
+                          if (index != spaces.length - 1)
                            Container(
                              margin: const EdgeInsets.symmetric(vertical: 15),
                              height: 1,
                              color: ColorsManager.greyColor,
                            ),
-                          ],
-                        ),
-                      );
-                    }),
-              ));
+                        ],
+                      ),
+                    );
+                  },
+                ),
+              ),
+      ),
+    );
  }
 }
--- a/lib/firebase_options.dart
+++ b/lib/firebase_options.dart
@ -0,0 +1,41 @@
+// File generated by FlutterFire CLI.
+// ignore_for_file: type=lint
+import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
+import 'package:flutter/foundation.dart' show kIsWeb;
+import 'package:syncrow_app/firebase_options_dev.dart' as dev;
+import 'package:syncrow_app/firebase_options_prod.dart' as prod;
+import 'package:syncrow_app/firebase_options_staging.dart' as staging;
+
+/// Default [FirebaseOptions] for use with your Firebase apps.
+///
+/// Example:
+/// ```dart
+/// import 'firebase_options.dart';
+/// // ...
+/// await Firebase.initializeApp(
+///   options: DefaultFirebaseOptions.currentPlatform,
+/// );
+/// ```
+class DefaultFirebaseOptions {
+  static FirebaseOptions currentPlatform(String flavor) {
+    if (kIsWeb) {
+      throw UnsupportedError(
+        'DefaultFirebaseOptions have not been configured for web - '
+        'you can reconfigure this by running the FlutterFire CLI again.',
+      );
+    }
+    switch (flavor) {
+      case 'dev':
+        return dev.DefaultFirebaseOptions.currentPlatform;
+      case 'staging':
+        return staging.DefaultFirebaseOptions.currentPlatform;
+      case 'production':
+        return prod.DefaultFirebaseOptions.currentPlatform;
+      default:
+      throw UnsupportedError(
+        'DefaultFirebaseOptions have not been configured for web - '
+        'you can reconfigure this by running the FlutterFire CLI again.',
+      );
+    }
+  }
+}
--- a/lib/firebase_options_dev.dart
+++ b/lib/firebase_options_dev.dart
@ -1,19 +1,20 @@
 // File generated by FlutterFire CLI.
 // ignore_for_file: type=lint
 import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
-import 'package:flutter/foundation.dart' show defaultTargetPlatform, kIsWeb, TargetPlatform;
+import 'package:flutter/foundation.dart'
+    show defaultTargetPlatform, kIsWeb, TargetPlatform;

 /// Default [FirebaseOptions] for use with your Firebase apps.
 ///
 /// Example:
 /// ```dart
-/// import 'firebase_options.dart';
+/// import 'firebase_options_dev.dart';
 /// // ...
 /// await Firebase.initializeApp(
 ///   options: DefaultFirebaseOptions.currentPlatform,
 /// );
 /// ```
-class DefaultFirebaseOptionsDev {
+class DefaultFirebaseOptions {
  static FirebaseOptions get currentPlatform {
    if (kIsWeb) {
      return web;
@ -45,30 +46,33 @@ class DefaultFirebaseOptionsDev {
    }
  }

+  static const FirebaseOptions web = FirebaseOptions(
+    apiKey: 'AIzaSyDgq5ywsnFVbbQO-Xz1Z4sR5bBcuiDaS9g',
+    appId: '1:255001682464:web:a03e2d6214c13101561245',
+    messagingSenderId: '255001682464',
+    projectId: 'syncrow-prod-79446',
+    authDomain: 'syncrow-prod-79446.firebaseapp.com',
+    databaseURL: 'https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/',
+    storageBucket: 'syncrow-prod-79446.firebasestorage.app',
+    measurementId: 'G-1850Q89RMK',
+  );
+
  static const FirebaseOptions android = FirebaseOptions(
-    apiKey: 'AIzaSyA5qOErxdm0zJmoHIB0TixfebYEsNRpwV0',
-    appId: '1:427332280600:android:bb6047adeeb80fb00c7e6d',
-    messagingSenderId: '427332280600',
-    projectId: 'test2-8a3d2',
-    storageBucket: 'test2-8a3d2.appspot.com',
+    apiKey: 'AIzaSyARJ5Wx2Uf8sbmb-AHB8WVfFwEFzrCIOKY',
+    appId: '1:255001682464:android:55ba58e8297b3cab561245',
+    messagingSenderId: '255001682464',
+    projectId: 'syncrow-prod-79446',
+    databaseURL: 'https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/',
+    storageBucket: 'syncrow-prod-79446.firebasestorage.app',
  );

  static const FirebaseOptions ios = FirebaseOptions(
-    apiKey: 'AIzaSyABnpH6yo2RRjtkp4PlvtK84hKwRm2DhBw',
-    appId: '1:427332280600:ios:373a65cce55a3af40c7e6d',
-    messagingSenderId: '427332280600',
-    projectId: 'test2-8a3d2',
-    storageBucket: 'test2-8a3d2.appspot.com',
-    iosBundleId: 'com.example.syncrowApp',
-  );
-
-  static const FirebaseOptions web = FirebaseOptions(
-    apiKey: 'AIzaSyCVEvKsJYzhWDFM-9Od68FE0nPpP933st0',
-    appId: '1:427332280600:web:ad50516a87a35a1a0c7e6d',
-    messagingSenderId: '427332280600',
-    projectId: 'test2-8a3d2',
-    authDomain: 'test2-8a3d2.firebaseapp.com',
-    storageBucket: 'test2-8a3d2.appspot.com',
-    measurementId: 'G-Z1RTTTV5H9',
+    apiKey: 'AIzaSyDeUWSHReSROpDbENGr--F49DH4VRzVM5A',
+    appId: '1:255001682464:ios:8a57c70f7f16f785561245',
+    messagingSenderId: '255001682464',
+    projectId: 'syncrow-prod-79446',
+    databaseURL: 'https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/',
+    storageBucket: 'syncrow-prod-79446.firebasestorage.app',
+    iosBundleId: 'com.syncrow.iot.ex.dev',
  );
 }
--- a/lib/firebase_options_prod.dart
+++ b/lib/firebase_options_prod.dart
@ -1,7 +1,8 @@
 // File generated by FlutterFire CLI.
 // ignore_for_file: type=lint
 import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
-import 'package:flutter/foundation.dart' show defaultTargetPlatform, kIsWeb, TargetPlatform;
+import 'package:flutter/foundation.dart'
+    show defaultTargetPlatform, kIsWeb, TargetPlatform;

 /// Default [FirebaseOptions] for use with your Firebase apps.
 ///
@ -13,7 +14,7 @@ import 'package:flutter/foundation.dart' show defaultTargetPlatform, kIsWeb, Tar
 ///   options: DefaultFirebaseOptions.currentPlatform,
 /// );
 /// ```
-class DefaultFirebaseOptionsStaging {
+class DefaultFirebaseOptions {
  static FirebaseOptions get currentPlatform {
    if (kIsWeb) {
      return web;
@ -59,9 +60,9 @@ class DefaultFirebaseOptionsStaging {
    appId: '1:786692570726:ios:455a6fcff77e130f17b7a7',
    messagingSenderId: '786692570726',
    projectId: 'syncrow-staging',
-    databaseURL: 'https://syncrow-staging-default-rtdb.firebaseio.com',
+    databaseURL: 'https://syncrow-prod-79446.asia-southeast1.firebasedatabase.app/',
    storageBucket: 'syncrow-staging.appspot.com',
-    iosBundleId: 'com.example.syncrow.app',
+    iosBundleId: 'com.syncrow.iot.ex',
  );

  static const FirebaseOptions web = FirebaseOptions(
@ -70,7 +71,7 @@ class DefaultFirebaseOptionsStaging {
    messagingSenderId: '786692570726',
    projectId: 'syncrow-staging',
    authDomain: 'syncrow-staging.firebaseapp.com',
-    databaseURL: 'https://syncrow-staging-default-rtdb.firebaseio.com',
+    databaseURL: 'https://syncrow-prod-79446.asia-southeast1.firebasedatabase.app/',
    storageBucket: 'syncrow-staging.appspot.com',
    measurementId: 'G-CZ3J3G6LMQ',
  );
--- a/lib/firebase_options_staging.dart
+++ b/lib/firebase_options_staging.dart
@ -0,0 +1,78 @@
+// File generated by FlutterFire CLI.
+// ignore_for_file: type=lint
+import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
+import 'package:flutter/foundation.dart'
+    show defaultTargetPlatform, kIsWeb, TargetPlatform;
+
+/// Default [FirebaseOptions] for use with your Firebase apps.
+///
+/// Example:
+/// ```dart
+/// import 'firebase_options_staging.dart';
+/// // ...
+/// await Firebase.initializeApp(
+///   options: DefaultFirebaseOptions.currentPlatform,
+/// );
+/// ```
+class DefaultFirebaseOptions {
+  static FirebaseOptions get currentPlatform {
+    if (kIsWeb) {
+      return web;
+    }
+    switch (defaultTargetPlatform) {
+      case TargetPlatform.android:
+        return android;
+      case TargetPlatform.iOS:
+        return ios;
+      case TargetPlatform.macOS:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for macos - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      case TargetPlatform.windows:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for windows - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      case TargetPlatform.linux:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for linux - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      default:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions are not supported for this platform.',
+        );
+    }
+  }
+
+  static const FirebaseOptions web = FirebaseOptions(
+    apiKey: 'AIzaSyDgq5ywsnFVbbQO-Xz1Z4sR5bBcuiDaS9g',
+    appId: '1:255001682464:web:a03e2d6214c13101561245',
+    messagingSenderId: '255001682464',
+    projectId: 'syncrow-prod-79446',
+    authDomain: 'syncrow-prod-79446.firebaseapp.com',
+    databaseURL: 'https://syncrow-prod-79446-default-rtdb.firebaseio.com',
+    storageBucket: 'syncrow-prod-79446.firebasestorage.app',
+    measurementId: 'G-1850Q89RMK',
+  );
+
+  static const FirebaseOptions android = FirebaseOptions(
+    apiKey: 'AIzaSyARJ5Wx2Uf8sbmb-AHB8WVfFwEFzrCIOKY',
+    appId: '1:255001682464:android:ed8920a3067fb40a561245',
+    messagingSenderId: '255001682464',
+    projectId: 'syncrow-prod-79446',
+    databaseURL: 'https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/',
+    storageBucket: 'syncrow-prod-79446.firebasestorage.app',
+  );
+
+  static const FirebaseOptions ios = FirebaseOptions(
+    apiKey: 'AIzaSyDeUWSHReSROpDbENGr--F49DH4VRzVM5A',
+    appId: '1:255001682464:ios:41b89a7702b75227561245',
+    messagingSenderId: '255001682464',
+    projectId: 'syncrow-prod-79446',
+    databaseURL: 'https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/',
+    storageBucket: 'syncrow-prod-79446.firebasestorage.app',
+    iosBundleId: 'com.syncrow.iot.ex.staging',
+  );
+}
--- a/lib/generated/assets.dart
+++ b/lib/generated/assets.dart
@ -495,6 +495,7 @@ class Assets {
  /// assets/icons/MenuIcons/HomeManagementIcons/CreateHome.svg
  static const String assetsIconsMenuIconsHomeManagementIconsCreateHome =
      "assets/icons/MenuIcons/HomeManagementIcons/CreateHome.svg";
+  static const String assetsIconsMenuBookingSystem = 'assets/icons/Booking.svg';

  /// Assets for assetsIconsMenuIconsHomeManagementIconsJoinAHome
  /// assets/icons/MenuIcons/HomeManagementIcons/joinAHome.svg
--- a/lib/main.dart
+++ b/lib/main.dart
@ -1,16 +1,18 @@
 import 'dart:async';
+
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:syncrow_app/firebase_options_prod.dart';
+import 'package:permission_handler/permission_handler.dart';
+import 'package:syncrow_app/firebase_options.dart';
 import 'package:syncrow_app/services/locator.dart';
 import 'package:syncrow_app/utils/bloc_observer.dart';
 import 'package:syncrow_app/utils/helpers/localization_helpers.dart';
+
 import 'my_app.dart';

-
-const String buildNumber = '1.0.30+17';
+const String buildNumber = '1.0.31+0';

 void main() {
  //to observe the state of the blocs in the output console
@ -25,6 +27,10 @@ void main() {
    // HttpOverrides.global = MyHttpOverrides();
    WidgetsFlutterBinding.ensureInitialized();

+    if (await Permission.nearbyWifiDevices.request().isGranted) {
+      // Permission is granted
+    }
+
    //license for the font
    // LicenseRegistry.addLicense(() async* {
    //   final license =
@ -36,7 +42,8 @@ void main() {
    initialSetup();

    await Firebase.initializeApp(
-      options: DefaultFirebaseOptionsStaging.currentPlatform,
+      options: DefaultFirebaseOptions.currentPlatform('production'),
+      name: 'syncrow_app',
    );

    //final SharedPreferences prefs = await SharedPreferences.getInstance();
--- a/lib/main_dev.dart
+++ b/lib/main_dev.dart
@ -1,12 +1,15 @@
 import 'dart:async';
+
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:syncrow_app/firebase_options_dev.dart';
+import 'package:permission_handler/permission_handler.dart';
+import 'package:syncrow_app/firebase_options.dart';
 import 'package:syncrow_app/services/locator.dart';
 import 'package:syncrow_app/utils/bloc_observer.dart';
 import 'package:syncrow_app/utils/helpers/localization_helpers.dart';
+
 import 'my_app.dart';

 void main() {
@ -22,6 +25,10 @@ void main() {
    // HttpOverrides.global = MyHttpOverrides();
    WidgetsFlutterBinding.ensureInitialized();

+    if (await Permission.nearbyWifiDevices.request().isGranted) {
+      // Permission is granted
+    }
+
    //license for the font
    // LicenseRegistry.addLicense(() async* {
    //   final license =
@ -33,7 +40,8 @@ void main() {
    initialSetup();

    await Firebase.initializeApp(
-      options: DefaultFirebaseOptionsDev.currentPlatform,
+      options: DefaultFirebaseOptions.currentPlatform('dev'),
+      name: 'syncrow_app',
    );

    //final SharedPreferences prefs = await SharedPreferences.getInstance();
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Faris Armoush	436c304143	bump-v to `1.0.31+0`.	2025-07-13 13:27:50 +03:00
Faris Armoush	fb71337859	Merge branch 'dev' of https://github.com/SyncrowIOT/syncrow-app into release-to-stores	2025-07-13 13:02:57 +03:00
Faris Armoush	cfa95e362e	Update Firebase URLs for development, production, and staging environments in GoogleService-Info.plist and google-services.json files.	2025-07-13 12:48:17 +03:00
Faris Armoush	c4fa2256f0	Refactor application package structure and update Firebase iOS bundle IDs for different environments.	2025-07-13 12:37:53 +03:00
Faris Armoush	e1b0d56cfd	firebase prod setup and flavors enhancement.	2025-07-13 11:49:58 +03:00
Faris Armoush	743d6cc5c6	bump package versions.	2025-07-07 15:58:07 +03:00
Rafeek-khoudare	fe472f0ca0	Merge pull request #112 from SyncrowIOT/SP-368-clarification-on-default-value-for-start-date-in-door-lock-online-tile-limited-password-repeat-section Clarification on Default Value for Start Date in Door Lock Online Tile Limited Password repeat section	2025-07-02 09:12:48 +03:00
Rafeek-Khoudare	d9b68a11e5	fix the initial value on start date and fix logic that prevent user from select old date (befor now)	2025-07-01 14:09:14 +03:00
Rafeek-khoudare	6c91af6f90	Merge pull request #111 from SyncrowIOT/SP-1781-fe-fix-bugs-related-to-wi-fi-door-lock-on-mobile-app [FE] Fix bugs related to Wi-Fi door lock on Mobile App	2025-06-24 12:55:50 +03:00
raf-dev1	65b8ecf672	PR improvments	2025-06-24 08:39:30 +03:00
Faris Armoush	3abe308d29	new applicationId, new iOS image, and removed unused packages.	2025-06-23 15:54:30 +03:00
raf-dev1	ea0bd32eb7	Merge pull request #110 from SyncrowIOT/SP-1439-FE-On-Manage-your-home-screen-the-container-height-that-has-the-spaces-is-longer-than-needed-it-should-extend-based-on-the-data-in-the-list [FE] On Manage your home screen the container height that has the spaces is longer than needed it should extend based on the data in the list	2025-06-23 14:06:56 +03:00
raf-dev1	069a8e16db	fix the issue in mobile to have indicator depend on time of unlock and unlock on pressing with lock animation	2025-06-23 13:55:52 +03:00
raf-dev1	5989cdcfa0	using Align to keep the container stick with elemnts number (tested for many items)	2025-06-23 10:00:13 +03:00
raf-dev1	4c81d22605	Merge pull request #109 from SyncrowIOT/build_booking_system Build booking system	2025-06-17 16:25:55 +03:00
raf-dev1	dc123e6231	PR fixes	2025-06-17 14:14:16 +03:00
raf-dev1	a705384717	the Book Page is Ready now but not linked with any logic	2025-06-16 14:11:41 +03:00
raf-dev1	d644c9c949	make the UI and link it with its blocs	2025-06-16 13:48:34 +03:00
raf-dev1	9d7113cee8	make the domain and data layers	2025-06-16 13:48:15 +03:00
raf-dev1	3893740080	start with upcoming widget	2025-06-16 09:40:49 +03:00
raf-dev1	c7a9cd7ea7	add current balance widget	2025-06-16 09:40:28 +03:00
raf-dev1	24a12af0f6	add booking appbar widget	2025-06-16 09:40:08 +03:00
raf-dev1	5d327e29c7	add phone Height and Width into helpers	2025-06-16 09:39:47 +03:00
raf-dev1	2b58af4560	add points to user model	2025-06-16 09:39:27 +03:00
raf-dev1	19f1bb8ec3	add booking to setting list	2025-06-16 08:51:56 +03:00
Faris Armoush	a4f56effbb	Merge pull request #108 from SyncrowIOT/bump-version-to-1.0.30+18 bump-v to `1.0.30+18`.	2025-06-03 16:46:22 +03:00
Faris Armoush	b35447384c	bump-v to `1.0.30+18`.	2025-06-03 12:39:07 +03:00
Rafeek-khoudare	dbf031287b	Merge pull request #107 from SyncrowIOT/SP-1562-FE-On-verify-OTP-screen-when-the-user-verifies-the-OTP-both-buttons-Verify-Resend-get-intoo-loading-state fix loading issue seperate loading states between verify and resend O…	2025-05-22 04:55:52 -05:00
Rafeek Alkhoudare	293d6a1d98	fix loading issue seperate loading states between verify and resend Otp&&perevent user to send api if otp length !=6	2025-05-22 02:45:24 -05:00
mohammad	eaecd4996e	Update flush sensor logic to trigger initial events when value is null or true,	2025-05-20 15:59:17 +03:00
mohammadnemer1	bfb0cb1dc1	Merge pull request #106 from SyncrowIOT/Fix-Flush-Sensor-Bugs Refactor device info model to handle optional fields more efficiently	2025-05-20 15:00:39 +03:00