Merge branch 'featureConfig' into develop

.gitignore

@@ -35,3 +35,82 @@ yarn-error.*
 
 # typescript
 *.tsbuildinfo
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+.idea
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser

app.config.js

@@ -34,6 +34,9 @@ export default {
             "favicon": "./assets/favicon.png"
         },
         "extra": {
+            "eas": {
+                "projectId": "aa30b37a-c8d0-47a1-9df4-6cdd8d488fb1"
+            }
         }
     }
 }

eas.json

@@ -0,0 +1,21 @@
+{
+  "cli": {
+    "version": ">= 7.6.2"
+  },
+  "build": {
+    "development": {
+      "developmentClient": true,
+      "distribution": "internal"
+    },
+    "preview": {
+      "distribution": "internal",
+      "android": {
+        "buildType": "apk"
+      }
+    },
+    "production": {}
+  },
+  "submit": {
+    "production": {}
+  }
+}

google-services.json

@@ -1,21 +1,21 @@
 {
   "project_info": {
-    "project_number": "303133651459",
-    "project_id": "fircise",
-    "storage_bucket": "fircise.appspot.com"
+    "project_number": "524126208137",
+    "project_id": "fircise-1a6aa",
+    "storage_bucket": "fircise-1a6aa.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:303133651459:android:cae21d3103ce60bfc75436",
+        "mobilesdk_app_id": "1:524126208137:android:9eab629c1c1023f2988658",
         "android_client_info": {
           "package_name": "com.sysmagnus.fircise"
         }
       },
       "oauth_client": [],
       "api_key": [
         {
-          "current_key": "AIzaSyDwjZO81OTixCBaGVpRr98kLQE3GMv_ywo"
+          "current_key": "AIzaSyA5AKTQn8gC59H6r0KdHqYGudpa4ymHsUA"
         }
       ],
       "services": {

package.json

@@ -19,7 +19,7 @@
     "native-base": "^3.4.28",
     "normalize-css-color": "^1.0.2",
     "react": "18.2.0",
-    "react-native": "0.73.5",
+    "react-native": "0.73.6",
     "react-native-gesture-handler": "~2.14.0",
     "react-native-maps": "1.10.0",
     "react-native-safe-area-context": "4.8.2",

store/user.js

@@ -56,7 +56,7 @@ export const useUserStore = create((set) => ({
             if (status !== 'granted') return
         }
 
-        const token = (await Notifications.getExpoPushTokenAsync({ projectId: "997ad5f3-b2fa-45e9-8d83-16c0ceef8968" })).data
+        const token = (await Notifications.getExpoPushTokenAsync({ projectId: "aa30b37a-c8d0-47a1-9df4-6cdd8d488fb1" })).data
         console.log('token:', token)
 
         try {