From f26df487f05392846efde829b1bc23364f0aaa89 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Thu, 4 Apr 2024 20:36:47 +0530
Subject: [PATCH 01/45] Biometric authentication

---
 .../android/app/src/main/AndroidManifest.xml  |  2 +
 apps/expo/app/_layout.tsx                     | 87 +++++++++++++++++--
 apps/expo/package.json                        |  1 +
 packages/app/auth/hooks/useBiometricSignIn.ts |  0
 yarn.lock                                     | 12 +++
 5 files changed, 96 insertions(+), 6 deletions(-)
 create mode 100644 packages/app/auth/hooks/useBiometricSignIn.ts

diff --git a/apps/expo/android/app/src/main/AndroidManifest.xml b/apps/expo/android/app/src/main/AndroidManifest.xml
index 93b702dca..a13bbe6b9 100644
--- a/apps/expo/android/app/src/main/AndroidManifest.xml
+++ b/apps/expo/android/app/src/main/AndroidManifest.xml
@@ -8,6 +8,8 @@
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="android.permission.VIBRATE"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+  <uses-permission android:name="android.permission.USE_FINGERPRINT" />
   <queries>
     <intent>
       <action android:name="android.intent.action.VIEW"/>
diff --git a/apps/expo/app/_layout.tsx b/apps/expo/app/_layout.tsx
index 15d3b3b82..e1f4b7bbf 100644
--- a/apps/expo/app/_layout.tsx
+++ b/apps/expo/app/_layout.tsx
@@ -1,14 +1,89 @@
 import { Provider } from 'app/provider';
 import { Stack } from 'expo-router';
+import * as LocalAuthentication from 'expo-local-authentication';
+import { useState, useEffect } from "react";
+import { Alert, Button, StyleSheet, Text, View } from "react-native";
 
 export default function HomeLayout() {
+  
+  const [authenticated, setAuthenticated] = useState(false);
+
+ 
+
+  const checkDeviceForHardware = async () => {
+      let compatible = await LocalAuthentication.hasHardwareAsync();
+      console.log("compatible", compatible);
+  };
+
+  const checkForBiometrics = async () => {
+      let biometricRecords = await LocalAuthentication.isEnrolledAsync();
+      console.log("biometricRecords", biometricRecords);
+  };
+
+  const authenticate = async () => {
+      let result = await LocalAuthentication.authenticateAsync();
+      if (result.success) {
+          setAuthenticated(true);
+      } else {
+          Alert.alert("Authentication failed");
+      }
+  };
+
+  useEffect(()=> {
+    checkDeviceForHardware();
+    checkForBiometrics();
+    authenticate();
+   }, [])
+
+
+
+
   return (
     <Provider>
-      <Stack
-        screenOptions={{
-          headerShown: false,
-        }}
-      />
+    {/* <View style={styles.container}>
+        <Text style={styles.heading}>
+            Biometric Authentication
+        </Text>
+        <Button
+            title={authenticated ? "Hide Content" : "Show Hidden Content"}
+            onPress={() => {
+                if (authenticated) {
+                    setAuthenticated(false);
+                    return;
+                }
+                checkDeviceForHardware();
+                checkForBiometrics();
+                authenticate();
+                
+            }}
+        />
+        {authenticated && ( */}
+            <Stack
+            screenOptions={{
+              headerShown: false,
+            }}
+          />
+                
+        {/* )}
+            
+
+    </View> */}
     </Provider>
-  );
+);
 }
+
+// const styles = StyleSheet.create({
+// container: {
+//     backgroundColor: "transparent",
+//     flex: 1,
+//     justifyContent: "space-evenly",
+//     alignItems: "center",
+
+// },
+// heading: {
+//     fontSize: 20,
+//     fontWeight: "bold",
+//     marginBottom: 20,
+//     color: "green",
+// },
+// });
\ No newline at end of file
diff --git a/apps/expo/package.json b/apps/expo/package.json
index 6f33ef19f..3674424ef 100644
--- a/apps/expo/package.json
+++ b/apps/expo/package.json
@@ -89,6 +89,7 @@
     "expo-image-picker": "^14.7.1",
     "expo-linear-gradient": "~12.3.0",
     "expo-linking": "~5.0.2",
+    "expo-local-authentication": "~13.4.1",
     "expo-location": "~16.1.0",
     "expo-random": "~13.2.0",
     "expo-router": "^2.0.9",
diff --git a/packages/app/auth/hooks/useBiometricSignIn.ts b/packages/app/auth/hooks/useBiometricSignIn.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/yarn.lock b/yarn.lock
index 7c87542b3..429e1ff00 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17220,6 +17220,7 @@ __metadata:
     expo-image-picker: "npm:^14.7.1"
     expo-linear-gradient: "npm:~12.3.0"
     expo-linking: "npm:~5.0.2"
+    expo-local-authentication: "npm:~13.4.1"
     expo-location: "npm:~16.1.0"
     expo-random: "npm:~13.2.0"
     expo-router: "npm:^2.0.9"
@@ -17469,6 +17470,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"expo-local-authentication@npm:~13.4.1":
+  version: 13.4.1
+  resolution: "expo-local-authentication@npm:13.4.1"
+  dependencies:
+    invariant: "npm:^2.2.4"
+  peerDependencies:
+    expo: "*"
+  checksum: 10/2b002b3061ae3c234a6de54bf1f7b86b8c89b23707213dec54c630e31475abda15cdfced3beb737771859c320e89a2d56754b581941d3c5511dd2d734b1550a9
+  languageName: node
+  linkType: hard
+
 "expo-location@npm:~16.1.0":
   version: 16.1.0
   resolution: "expo-location@npm:16.1.0"

From 57b31149b69c17a4b93c1bdfcbe22561fa4fdde4 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Fri, 5 Apr 2024 22:28:27 +0530
Subject: [PATCH 02/45] workflow changes

---
 .github/workflows/build.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4f1acdda6..43e1113e4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,9 +1,6 @@
 name: android-build-apk
-on:
-  push:
-    branches: [ "**" ]
-  pull_request:
-    branches: [ "**" ]
+on: push
+  
 
 jobs:
   install-and-test:
@@ -23,7 +20,7 @@ jobs:
           yarn install
       - name: Build Android Release
         run: |
-          cd client/android && ./gradlew assembleRelease
+          cd apps/expo/android && ./gradlew assembleRelease
       - name: Upload Artifact
         uses: actions/upload-artifact@v1
         with:

From 4d710d8d07a213f0c1019093ebc2e8877f5e4048 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sat, 6 Apr 2024 12:25:33 +0530
Subject: [PATCH 03/45] Changes in expo-build

---
 .github/workflows/expo.build.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/expo.build.yml b/.github/workflows/expo.build.yml
index f8f291f01..f373e0e3d 100644
--- a/.github/workflows/expo.build.yml
+++ b/.github/workflows/expo.build.yml
@@ -1,10 +1,10 @@
 name: EAS Local Build
 
-on:
-  push:
-    branches: [ "**" ]
-  pull_request:
-    branches: [ "**" ]
+on: push
+  # push:
+  #   branches: [ "**" ]
+  # pull_request:
+  #   branches: [ "**" ]
 
 jobs:
   build:
@@ -17,7 +17,8 @@ jobs:
     - name: Install Node.js
       uses: actions/setup-node@v2
       with:
-        node-version: '20' # Use the version you prefer
+        node-version: 20.x # Use the version you prefer
+        cache : yarn 
 
     - name: 🏗 Setup EAS
       uses: expo/expo-github-action@v8
@@ -26,7 +27,7 @@ jobs:
         token: ${{ secrets.EXPO_TOKEN }}
 
     - name: Set up Yarn
-      run: yarn
+      run: yarn install
 
     # - name: 🚀 Build app
     #   working-directory: ./client
@@ -45,6 +46,8 @@ jobs:
 
     # If you need additional setup or configurations, add them here
 
+     
+
     - name: Run Local Build for Android
       working-directory: ./apps/expo
       run: eas build --non-interactive --platform android --local

From b5272a69591aa74b25bdbce2c815bdb53b761dd8 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sat, 6 Apr 2024 16:31:19 +0530
Subject: [PATCH 04/45] Workflow changes 2

---
 .github/workflows/build.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 43e1113e4..75dcadd8e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,20 +7,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+
+
       - name: Install yarn dependencies
         run: |
           yarn install
+
+
   build-android:
     needs: install-and-test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+
       - name: Install yarn dependencies
         run: |
           yarn install
+
       - name: Build Android Release
         run: |
           cd apps/expo/android && ./gradlew assembleRelease
+
       - name: Upload Artifact
         uses: actions/upload-artifact@v1
         with:

From 0779fa9f14ed2e986d9f1469e8eeee9a2ecb36a9 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sat, 6 Apr 2024 16:43:52 +0530
Subject: [PATCH 05/45] Workflow changes 3

---
 apps/expo/eas.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/expo/eas.json b/apps/expo/eas.json
index 83911e116..497c6e69f 100644
--- a/apps/expo/eas.json
+++ b/apps/expo/eas.json
@@ -22,9 +22,17 @@
     "production": {
       "ios": {
         "resourceClass": "m-medium"
+      },
+      "env": {
+        "EXPO_PUBLIC_API_URL": "https://api.production.com"
       }
     }
   },
+  "test": {
+    "env": {
+      "EXPO_PUBLIC_API_URL": "https://api.test.com"
+    }
+  },
   "submit": {
     "production": {}
   }

From e2034a8e4c11da2c7839cd4ff4ebb05f29e64077 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sat, 6 Apr 2024 16:49:16 +0530
Subject: [PATCH 06/45] Workflow changes 4

---
 apps/expo/eas.json | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/expo/eas.json b/apps/expo/eas.json
index 497c6e69f..c705683a0 100644
--- a/apps/expo/eas.json
+++ b/apps/expo/eas.json
@@ -26,13 +26,14 @@
       "env": {
         "EXPO_PUBLIC_API_URL": "https://api.production.com"
       }
+    },
+    "test": {
+      "env": {
+        "EXPO_PUBLIC_API_URL": "https://api.test.com"
+      }
     }
   },
-  "test": {
-    "env": {
-      "EXPO_PUBLIC_API_URL": "https://api.test.com"
-    }
-  },
+  
   "submit": {
     "production": {}
   }

From c3e5135edc94664e2f2c823af04904207a9bb3c3 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sat, 6 Apr 2024 17:32:42 +0530
Subject: [PATCH 07/45] Workflow changes 5

---
 .github/workflows/expo.build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/expo.build.yml b/.github/workflows/expo.build.yml
index f373e0e3d..b08e5ed8c 100644
--- a/.github/workflows/expo.build.yml
+++ b/.github/workflows/expo.build.yml
@@ -49,9 +49,9 @@ jobs:
      
 
     - name: Run Local Build for Android
-      working-directory: ./apps/expo
+      # working-directory: ./apps/expo
       run: eas build --non-interactive --platform android --local
 
     - name: Run Local Build for iOS
-      working-directory: ./apps/expo
+      # working-directory: ./apps/expo
       run: eas build --non-interactive --platform ios --local
\ No newline at end of file

From 25f25f8569243e76cb5f87b305e4cdfe0f575446 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sat, 6 Apr 2024 22:13:54 +0530
Subject: [PATCH 08/45] add app config file for eas

---
 .github/workflows/build.yml |  7 ++++++-
 apps/expo/app.config.js     | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 apps/expo/app.config.js

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 43e1113e4..c3b5b1dc6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,10 @@
 name: android-build-apk
-on: push
+
+on:
+  push:
+    branches: [ "**" ]
+  pull_request:
+    branches: [ "**" ]
   
 
 jobs:
diff --git a/apps/expo/app.config.js b/apps/expo/app.config.js
new file mode 100644
index 000000000..ebd4a9bf6
--- /dev/null
+++ b/apps/expo/app.config.js
@@ -0,0 +1,19 @@
+module.exports = ({ config }) => {
+    console.log(JSON.stringify(config))
+    console.log(process.env);
+    return {
+      ...config,
+      plugins: config.plugins.map(i => {
+        if (i[0] === "@rnmapbox/maps") {
+            return [
+                "@rnmapbox/maps",
+                {
+                  "RNMapboxMapsImpl": "mapbox",
+                  "RNMapboxMapsDownloadToken": process.env.MAPBOX_DOWNLOADS_TOKEN2
+                }
+              ]
+        }
+        return i;
+      })
+    };
+  };
\ No newline at end of file

From cb56049f5aeb8a8d9207302cab72c0343dd19c99 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sun, 7 Apr 2024 10:37:41 +0530
Subject: [PATCH 09/45] remove app.json from git ignore

---
 .gitignore           |  1 -
 apps/expo/.gitignore |  1 -
 apps/expo/app.json   | 68 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 apps/expo/app.json

diff --git a/.gitignore b/.gitignore
index 8b4bac0b9..0ded7ea1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@ node_modules
 # dist
 old/
 .zip
-app.json
 Podfile
 Podfile.lock
 gradle.properties
diff --git a/apps/expo/.gitignore b/apps/expo/.gitignore
index 7c3ecb273..21722f072 100644
--- a/apps/expo/.gitignore
+++ b/apps/expo/.gitignore
@@ -1,5 +1,4 @@
 # For users to edit
-app.json
 .env
 
 .expo/
diff --git a/apps/expo/app.json b/apps/expo/app.json
new file mode 100644
index 000000000..2704568c0
--- /dev/null
+++ b/apps/expo/app.json
@@ -0,0 +1,68 @@
+{
+  "expo": {
+    "name": "packrat",
+    "slug": "packrat",
+    "version": "1.0.0",
+    "orientation": "portrait",
+    "icon": "./assets/packrat-app-icon.png",
+    "userInterfaceStyle": "automatic",
+    "scheme": "packrat",
+    "splash": {
+      "image": "./assets/splash.png",
+      "resizeMode": "contain",
+      "backgroundColor": "#ffffff",
+      "scheme": "myapp"
+    },
+    "assetBundlePatterns": ["**/*"],
+    "ios": {
+      "supportsTablet": true,
+      "bundleIdentifier": "com.andrewbierman.packrat"
+    },
+    "android": {
+      "adaptiveIcon": {
+        "foregroundImage": "./assets/packrat-app-icon.png",
+        "backgroundColor": "#ffffff"
+      },
+      "package": "com.andrewbierman.packrat"
+    },
+    "web": {
+      "favicon": "./assets/favicon.png",
+      "bundler": "metro"
+    },
+    "plugins": [
+      [
+        "@rnmapbox/maps",
+        {
+          "RNMapboxMapsImpl": "mapbox",
+          "RNMapboxMapsDownloadToken": "MAPBOX_DOWNLOADS_TOKEN_FROM_ENV"
+        }
+      ],
+      [
+        "expo-document-picker",
+        {
+          "iCloudContainerEnvironment": "Production"
+        }
+      ],
+      [
+        "expo-build-properties",
+        {
+          "android": {
+            "compileSdkVersion": 31,
+            "targetSdkVersion": 31,
+            "buildToolsVersion": "31.0.0"
+          },
+          "ios": {
+            "deploymentTarget": "13.0"
+          }
+        }
+      ]
+    ],
+    "extra": {
+      "eas": {
+        "projectId": "267945b1-d9ac-4621-8541-826a2c70576d"
+      }
+    },
+    "owner": "packrat"
+  }
+
+}
\ No newline at end of file

From ce7f7003a0d667859d670478439862917f71b03e Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sun, 7 Apr 2024 11:20:21 +0530
Subject: [PATCH 10/45] remove gradle.properties from git ignore

---
 .gitignore                          |  2 +-
 apps/expo/android/gradle.properties | 55 +++++++++++++++++++++++++++++
 eas.json                            | 18 ++++++++++
 3 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 apps/expo/android/gradle.properties
 create mode 100644 eas.json

diff --git a/.gitignore b/.gitignore
index 0ded7ea1f..e6cd0cb4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ old/
 .zip
 Podfile
 Podfile.lock
-gradle.properties
+
 client.zip
 *.zip
 .vscode
diff --git a/apps/expo/android/gradle.properties b/apps/expo/android/gradle.properties
new file mode 100644
index 000000000..b20835c9e
--- /dev/null
+++ b/apps/expo/android/gradle.properties
@@ -0,0 +1,55 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+
+# Version of flipper SDK to use with React Native
+FLIPPER_VERSION=0.125.0
+
+# Use this property to specify which architecture you want to build.
+# You can also override it from the CLI using
+# ./gradlew <task> -PreactNativeArchitectures=x86_64
+reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
+
+# Use this property to enable support to the new architecture.
+# This will allow you to use TurboModules and the Fabric render in
+# your application. You should enable this flag either if you want
+# to write custom TurboModules/Fabric components OR use libraries that
+# are providing them.
+newArchEnabled=false
+
+# The hosted JavaScript engine
+# Supported values: expo.jsEngine = "hermes" | "jsc"
+expo.jsEngine=jsc
+
+# Enable GIF support in React Native images (~200 B increase)
+expo.gif.enabled=true
+# Enable webp support in React Native images (~85 KB increase)
+expo.webp.enabled=true
+# Enable animated webp support (~3.4 MB increase)
+# Disabled by default because iOS doesn't support animated webp
+expo.webp.animated=false
+
+MAPBOX_DOWNLOADS_TOKEN="MAPBOX_DOWNLOADS_TOKEN_FROM_ENV"
\ No newline at end of file
diff --git a/eas.json b/eas.json
new file mode 100644
index 000000000..5e8a2be3f
--- /dev/null
+++ b/eas.json
@@ -0,0 +1,18 @@
+{
+  "cli": {
+    "version": ">= 7.6.2"
+  },
+  "build": {
+    "development": {
+      "developmentClient": true,
+      "distribution": "internal"
+    },
+    "preview": {
+      "distribution": "internal"
+    },
+    "production": {}
+  },
+  "submit": {
+    "production": {}
+  }
+}

From 05dfed64afa041942454a56a71cac9ad7373998a Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sun, 7 Apr 2024 11:38:34 +0530
Subject: [PATCH 11/45] remove gradle.properties from git ignore

---
 apps/expo/app.json                        |  3 ++-
 apps/expo/plugins/withGradleProperties.js | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 apps/expo/plugins/withGradleProperties.js

diff --git a/apps/expo/app.json b/apps/expo/app.json
index 2704568c0..f4a6ddc42 100644
--- a/apps/expo/app.json
+++ b/apps/expo/app.json
@@ -55,7 +55,8 @@
             "deploymentTarget": "13.0"
           }
         }
-      ]
+      ],
+      "./plugins/withGradleProperties.js"
     ],
     "extra": {
       "eas": {
diff --git a/apps/expo/plugins/withGradleProperties.js b/apps/expo/plugins/withGradleProperties.js
new file mode 100644
index 000000000..84dc3e013
--- /dev/null
+++ b/apps/expo/plugins/withGradleProperties.js
@@ -0,0 +1,17 @@
+const { withGradleProperties } = require('@expo/config-plugins');
+
+module.exports = (config) => {
+  const newGraddleProperties = [
+    {
+      type: 'property',
+      key: 'MAPBOX_DOWNLOADS_TOKEN',
+      value:process.env.MAPBOX_DOWNLOADS_TOKEN2,
+    }
+  ];
+
+  return withGradleProperties(config, (config) => {
+    newGraddleProperties.map((gradleProperty) => config.modResults.push(gradleProperty));
+
+    return config;
+  });
+};
\ No newline at end of file

From 7f3c5ce952305efff3f4b1f94d32a92463cecdaf Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sun, 7 Apr 2024 21:47:55 +0530
Subject: [PATCH 12/45] remove console logs

---
 apps/expo/app.config.js | 2 --
 apps/expo/app.json      | 1 -
 2 files changed, 3 deletions(-)

diff --git a/apps/expo/app.config.js b/apps/expo/app.config.js
index ebd4a9bf6..bb716c425 100644
--- a/apps/expo/app.config.js
+++ b/apps/expo/app.config.js
@@ -1,6 +1,4 @@
 module.exports = ({ config }) => {
-    console.log(JSON.stringify(config))
-    console.log(process.env);
     return {
       ...config,
       plugins: config.plugins.map(i => {
diff --git a/apps/expo/app.json b/apps/expo/app.json
index f4a6ddc42..ca52d6ef4 100644
--- a/apps/expo/app.json
+++ b/apps/expo/app.json
@@ -65,5 +65,4 @@
     },
     "owner": "packrat"
   }
-
 }
\ No newline at end of file

From 55a76a28f70c95a6cb20649b6b77ce06afc1e4f8 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sun, 7 Apr 2024 22:04:42 +0530
Subject: [PATCH 13/45] add hermesEnabled=true in gradle.properties

---
 apps/expo/android/gradle.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/expo/android/gradle.properties b/apps/expo/android/gradle.properties
index b20835c9e..e3f126b8f 100644
--- a/apps/expo/android/gradle.properties
+++ b/apps/expo/android/gradle.properties
@@ -52,4 +52,5 @@ expo.webp.enabled=true
 # Disabled by default because iOS doesn't support animated webp
 expo.webp.animated=false
 
-MAPBOX_DOWNLOADS_TOKEN="MAPBOX_DOWNLOADS_TOKEN_FROM_ENV"
\ No newline at end of file
+MAPBOX_DOWNLOADS_TOKEN="MAPBOX_DOWNLOADS_TOKEN_FROM_ENV"
+hermesEnabled=true
\ No newline at end of file

From e64552530e89d309dbddf35fa80db5a96bc2234c Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sun, 7 Apr 2024 22:20:33 +0530
Subject: [PATCH 14/45] Remove mapbox download token

---
 apps/expo/android/gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/expo/android/gradle.properties b/apps/expo/android/gradle.properties
index e3f126b8f..298f1d39b 100644
--- a/apps/expo/android/gradle.properties
+++ b/apps/expo/android/gradle.properties
@@ -52,5 +52,5 @@ expo.webp.enabled=true
 # Disabled by default because iOS doesn't support animated webp
 expo.webp.animated=false
 
-MAPBOX_DOWNLOADS_TOKEN="MAPBOX_DOWNLOADS_TOKEN_FROM_ENV"
+# MAPBOX_DOWNLOADS_TOKEN="MAPBOX_DOWNLOADS_TOKEN_FROM_ENV"
 hermesEnabled=true
\ No newline at end of file

From 6ba20a4e8f26e21d374550a350b84adab70152b0 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sun, 7 Apr 2024 22:47:28 +0530
Subject: [PATCH 15/45] changes in eas json and uncomment rn mapbox key field
 in gradle.properties

---
 apps/expo/android/gradle.properties | 2 +-
 apps/expo/eas.json                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/expo/android/gradle.properties b/apps/expo/android/gradle.properties
index 298f1d39b..e3f126b8f 100644
--- a/apps/expo/android/gradle.properties
+++ b/apps/expo/android/gradle.properties
@@ -52,5 +52,5 @@ expo.webp.enabled=true
 # Disabled by default because iOS doesn't support animated webp
 expo.webp.animated=false
 
-# MAPBOX_DOWNLOADS_TOKEN="MAPBOX_DOWNLOADS_TOKEN_FROM_ENV"
+MAPBOX_DOWNLOADS_TOKEN="MAPBOX_DOWNLOADS_TOKEN_FROM_ENV"
 hermesEnabled=true
\ No newline at end of file
diff --git a/apps/expo/eas.json b/apps/expo/eas.json
index c705683a0..508891ea2 100644
--- a/apps/expo/eas.json
+++ b/apps/expo/eas.json
@@ -4,6 +4,7 @@
   },
   "build": {
     "development": {
+      "developmentClient": true,
       "distribution": "internal",
       "android": {
         "gradleCommand": ":app:assembleDebug"

From 678234078da909d66f0c82e7c4a6a8a9d6ece539 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sun, 7 Apr 2024 22:50:36 +0530
Subject: [PATCH 16/45] changes in eas json and uncomment rn mapbox key field
 in gradle.properties

---
 apps/expo/package.json |  1 +
 yarn.lock              | 87 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)

diff --git a/apps/expo/package.json b/apps/expo/package.json
index 3674424ef..073fdda08 100644
--- a/apps/expo/package.json
+++ b/apps/expo/package.json
@@ -82,6 +82,7 @@
     "expo-checkbox": "~2.4.0",
     "expo-constants": "~14.4.2",
     "expo-crypto": "~12.4.1",
+    "expo-dev-client": "~2.4.13",
     "expo-document-picker": "~11.5.4",
     "expo-file-system": "~15.4.4",
     "expo-font": "~11.4.0",
diff --git a/yarn.lock b/yarn.lock
index 429e1ff00..79065efbd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17213,6 +17213,7 @@ __metadata:
     expo-checkbox: "npm:~2.4.0"
     expo-constants: "npm:~14.4.2"
     expo-crypto: "npm:~12.4.1"
+    expo-dev-client: "npm:~2.4.13"
     expo-document-picker: "npm:~11.5.4"
     expo-file-system: "npm:~15.4.4"
     expo-font: "npm:~11.4.0"
@@ -17366,6 +17367,67 @@ __metadata:
   languageName: node
   linkType: hard
 
+"expo-dev-client@npm:~2.4.13":
+  version: 2.4.13
+  resolution: "expo-dev-client@npm:2.4.13"
+  dependencies:
+    expo-dev-launcher: "npm:2.4.15"
+    expo-dev-menu: "npm:3.2.4"
+    expo-dev-menu-interface: "npm:1.3.0"
+    expo-manifests: "npm:~0.7.0"
+    expo-updates-interface: "npm:~0.10.0"
+  peerDependencies:
+    expo: "*"
+  checksum: 10/65c474cb28f18f1a000a1ff1eec97cd39c39ae992eff175c5ca0b16615ad6a5b81cf2b3bbb06b8cef0e71aeba4de3a92939268b65dbee1862ab95e8fbe83a7b6
+  languageName: node
+  linkType: hard
+
+"expo-dev-launcher@npm:2.4.15":
+  version: 2.4.15
+  resolution: "expo-dev-launcher@npm:2.4.15"
+  dependencies:
+    expo-dev-menu: "npm:3.2.3"
+    resolve-from: "npm:^5.0.0"
+    semver: "npm:^7.5.3"
+  peerDependencies:
+    expo: "*"
+  checksum: 10/d1ed90be355511296d59755148f97d1c198ea782140383e0cd495c457fc39f8eaceaaaf850f4b864a408ca72b6803e0c216e596c254194f8fb4fdc66dbb57b60
+  languageName: node
+  linkType: hard
+
+"expo-dev-menu-interface@npm:1.3.0":
+  version: 1.3.0
+  resolution: "expo-dev-menu-interface@npm:1.3.0"
+  peerDependencies:
+    expo: "*"
+  checksum: 10/ebe884399d4ab75d4eee7ced509727c4eb9f8f9b0113ed06c52af819e579911e58adb3174573b423d3c5f0099fc34c35b1ecd744125f90485e94b3124f501abf
+  languageName: node
+  linkType: hard
+
+"expo-dev-menu@npm:3.2.3":
+  version: 3.2.3
+  resolution: "expo-dev-menu@npm:3.2.3"
+  dependencies:
+    expo-dev-menu-interface: "npm:1.3.0"
+    semver: "npm:^7.5.3"
+  peerDependencies:
+    expo: "*"
+  checksum: 10/d2d5cfe47d591691e5e8932a15dad8c4f3c64e52da22fc0eeefdc71158a6c7cbaa466383c2d1ca9da517435d7bf0e0373aacf982c700d19c1300efb0fa3c978a
+  languageName: node
+  linkType: hard
+
+"expo-dev-menu@npm:3.2.4":
+  version: 3.2.4
+  resolution: "expo-dev-menu@npm:3.2.4"
+  dependencies:
+    expo-dev-menu-interface: "npm:1.3.0"
+    semver: "npm:^7.5.3"
+  peerDependencies:
+    expo: "*"
+  checksum: 10/f5817193d26d70431009cc049a6f498889e5ea1f66f2481daa5d92be3fbdb08645f3fdd29ca845f3c56ac15dbd69909f1f3d27e4e37b2413aa59d8b139d47bba
+  languageName: node
+  linkType: hard
+
 "expo-document-picker@npm:~11.5.4":
   version: 11.5.4
   resolution: "expo-document-picker@npm:11.5.4"
@@ -17439,6 +17501,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"expo-json-utils@npm:~0.7.0":
+  version: 0.7.1
+  resolution: "expo-json-utils@npm:0.7.1"
+  checksum: 10/27a71332bb1cf652ae611a96eb78b526fb2a47a5df4f74fcb88551d041d0ca399df3e54f1ff1d0b9c41a219e616ef9c4c667215ca02da7f4f2aadf110f9850ee
+  languageName: node
+  linkType: hard
+
 "expo-keep-awake@npm:~12.3.0":
   version: 12.3.0
   resolution: "expo-keep-awake@npm:12.3.0"
@@ -17490,6 +17559,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"expo-manifests@npm:~0.7.0":
+  version: 0.7.2
+  resolution: "expo-manifests@npm:0.7.2"
+  dependencies:
+    expo-json-utils: "npm:~0.7.0"
+  checksum: 10/0b9ff12d397b2621459cc279ca453b8ff80958ff6e0c076c5745fe81a77c6374896606310050db10aea6fcef194a43705784698fecc2bff52bd0dcc0e1d9925d
+  languageName: node
+  linkType: hard
+
 "expo-modules-autolinking@npm:1.5.1":
   version: 1.5.1
   resolution: "expo-modules-autolinking@npm:1.5.1"
@@ -17628,6 +17706,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"expo-updates-interface@npm:~0.10.0":
+  version: 0.10.1
+  resolution: "expo-updates-interface@npm:0.10.1"
+  peerDependencies:
+    expo: "*"
+  checksum: 10/e2655fd9740458b1e0f64c9f54b46bbe0f7fe9e290a586f18c8a494e66c2fc4222e15ea2610fd8c0c26d6f684f63f2eaa43da59385632feeee2d6ca76763e0af
+  languageName: node
+  linkType: hard
+
 "expo-web-browser@npm:~12.3.0, expo-web-browser@npm:~12.3.2":
   version: 12.3.2
   resolution: "expo-web-browser@npm:12.3.2"

From 14dfd5f1284a2bad2249962db79e7356e66596cc Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Mon, 8 Apr 2024 17:08:21 +0530
Subject: [PATCH 17/45] remove biometric code

---
 app.json                                  |  3 +
 apps/expo/app.json                        |  3 +-
 apps/expo/app/_layout.tsx                 | 89 ++---------------------
 apps/expo/plugins/withGradleProperties.js | 17 -----
 packages/app/constants/api.ts             |  2 +-
 5 files changed, 12 insertions(+), 102 deletions(-)
 create mode 100644 app.json
 delete mode 100644 apps/expo/plugins/withGradleProperties.js

diff --git a/app.json b/app.json
new file mode 100644
index 000000000..c9e8c8a40
--- /dev/null
+++ b/app.json
@@ -0,0 +1,3 @@
+{
+  "expo": {}
+}
\ No newline at end of file
diff --git a/apps/expo/app.json b/apps/expo/app.json
index ca52d6ef4..1c9a0c0a7 100644
--- a/apps/expo/app.json
+++ b/apps/expo/app.json
@@ -55,8 +55,7 @@
             "deploymentTarget": "13.0"
           }
         }
-      ],
-      "./plugins/withGradleProperties.js"
+      ]
     ],
     "extra": {
       "eas": {
diff --git a/apps/expo/app/_layout.tsx b/apps/expo/app/_layout.tsx
index e1f4b7bbf..aeaffa7ac 100644
--- a/apps/expo/app/_layout.tsx
+++ b/apps/expo/app/_layout.tsx
@@ -1,89 +1,14 @@
 import { Provider } from 'app/provider';
 import { Stack } from 'expo-router';
-import * as LocalAuthentication from 'expo-local-authentication';
-import { useState, useEffect } from "react";
-import { Alert, Button, StyleSheet, Text, View } from "react-native";
 
 export default function HomeLayout() {
-  
-  const [authenticated, setAuthenticated] = useState(false);
-
- 
-
-  const checkDeviceForHardware = async () => {
-      let compatible = await LocalAuthentication.hasHardwareAsync();
-      console.log("compatible", compatible);
-  };
-
-  const checkForBiometrics = async () => {
-      let biometricRecords = await LocalAuthentication.isEnrolledAsync();
-      console.log("biometricRecords", biometricRecords);
-  };
-
-  const authenticate = async () => {
-      let result = await LocalAuthentication.authenticateAsync();
-      if (result.success) {
-          setAuthenticated(true);
-      } else {
-          Alert.alert("Authentication failed");
-      }
-  };
-
-  useEffect(()=> {
-    checkDeviceForHardware();
-    checkForBiometrics();
-    authenticate();
-   }, [])
-
-
-
-
   return (
     <Provider>
-    {/* <View style={styles.container}>
-        <Text style={styles.heading}>
-            Biometric Authentication
-        </Text>
-        <Button
-            title={authenticated ? "Hide Content" : "Show Hidden Content"}
-            onPress={() => {
-                if (authenticated) {
-                    setAuthenticated(false);
-                    return;
-                }
-                checkDeviceForHardware();
-                checkForBiometrics();
-                authenticate();
-                
-            }}
-        />
-        {authenticated && ( */}
-            <Stack
-            screenOptions={{
-              headerShown: false,
-            }}
-          />
-                
-        {/* )}
-            
-
-    </View> */}
+      <Stack
+        screenOptions={{
+          headerShown: false,
+        }}
+      />
     </Provider>
-);
-}
-
-// const styles = StyleSheet.create({
-// container: {
-//     backgroundColor: "transparent",
-//     flex: 1,
-//     justifyContent: "space-evenly",
-//     alignItems: "center",
-
-// },
-// heading: {
-//     fontSize: 20,
-//     fontWeight: "bold",
-//     marginBottom: 20,
-//     color: "green",
-// },
-// });
\ No newline at end of file
+  );
+}
\ No newline at end of file
diff --git a/apps/expo/plugins/withGradleProperties.js b/apps/expo/plugins/withGradleProperties.js
deleted file mode 100644
index 84dc3e013..000000000
--- a/apps/expo/plugins/withGradleProperties.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const { withGradleProperties } = require('@expo/config-plugins');
-
-module.exports = (config) => {
-  const newGraddleProperties = [
-    {
-      type: 'property',
-      key: 'MAPBOX_DOWNLOADS_TOKEN',
-      value:process.env.MAPBOX_DOWNLOADS_TOKEN2,
-    }
-  ];
-
-  return withGradleProperties(config, (config) => {
-    newGraddleProperties.map((gradleProperty) => config.modResults.push(gradleProperty));
-
-    return config;
-  });
-};
\ No newline at end of file
diff --git a/packages/app/constants/api.ts b/packages/app/constants/api.ts
index b954031bf..aa0c1f743 100644
--- a/packages/app/constants/api.ts
+++ b/packages/app/constants/api.ts
@@ -8,7 +8,7 @@ if (NODE_ENV === 'production') {
   // api = API_URL;
   api = NEXT_PUBLIC_API_URL;
 } else {
-  api = 'http://localhost:3000/api';
+  api = 'http://192.168.0.83:3000/api';
   // api = "https://packrat.onrender.com";
 }
 

From 957fc11d71a88ec2174e0a8d05a73c979c9c8c6f Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Mon, 8 Apr 2024 21:12:39 +0530
Subject: [PATCH 18/45] Comment RIconButton in ZDropdown

---
 packages/ui/src/ZDropdown/index.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/ui/src/ZDropdown/index.tsx b/packages/ui/src/ZDropdown/index.tsx
index 051aa0105..d99711664 100644
--- a/packages/ui/src/ZDropdown/index.tsx
+++ b/packages/ui/src/ZDropdown/index.tsx
@@ -4,7 +4,7 @@ import { styled } from 'tamagui';
 import { MaterialIcons } from '@expo/vector-icons';
 
 
-import { RIconButton } from '@packrat/ui';
+// import { RIconButton } from '@packrat/ui';
 
   
 const CustomContent = styled(DropdownMenu.Content, {
@@ -41,11 +41,12 @@ const CustomContent = styled(DropdownMenu.Content, {
     return (
       <DropdownMenu.Root>
         <DropdownMenu.Trigger>
-          <RIconButton
+          <></>
+          {/* <RIconButton
             backgroundColor="transparent"
             icon={<MaterialIcons name="more-horiz" size={25} />}
             style={{ padding: 0}}
-          />
+          /> */}
         </DropdownMenu.Trigger>
         <CustomContent>
           {dropdownItems.map(({label, onSelect = () => {}}) => (
@@ -62,11 +63,12 @@ const CustomContent = styled(DropdownMenu.Content, {
     return (
       <DropdownMenu.Root>
         <DropdownMenu.Trigger>
-          <RIconButton
+          <></>
+          {/* <RIconButton
             backgroundColor="transparent"
             icon={<MaterialIcons name="more-horiz" size={25} />}
             style={{ padding: 0}}
-          />
+          /> */}
         </DropdownMenu.Trigger>
         <DropdownMenu.Content>
           {dropdownItems.map(({label, onSelect = () => {}}) => (

From 4ead074b1ddfb6686cf18adf981a452511fcfe23 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Tue, 9 Apr 2024 11:12:00 +0530
Subject: [PATCH 19/45] Uncomment RIconButton in ZDropdown

---
 packages/app/constants/api.ts       |  2 +-
 packages/ui/src/ZDropdown/index.tsx | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/app/constants/api.ts b/packages/app/constants/api.ts
index aa0c1f743..b954031bf 100644
--- a/packages/app/constants/api.ts
+++ b/packages/app/constants/api.ts
@@ -8,7 +8,7 @@ if (NODE_ENV === 'production') {
   // api = API_URL;
   api = NEXT_PUBLIC_API_URL;
 } else {
-  api = 'http://192.168.0.83:3000/api';
+  api = 'http://localhost:3000/api';
   // api = "https://packrat.onrender.com";
 }
 
diff --git a/packages/ui/src/ZDropdown/index.tsx b/packages/ui/src/ZDropdown/index.tsx
index d99711664..7820db7c1 100644
--- a/packages/ui/src/ZDropdown/index.tsx
+++ b/packages/ui/src/ZDropdown/index.tsx
@@ -4,7 +4,7 @@ import { styled } from 'tamagui';
 import { MaterialIcons } from '@expo/vector-icons';
 
 
-// import { RIconButton } from '@packrat/ui';
+import { RIconButton } from '@packrat/ui';
 
   
 const CustomContent = styled(DropdownMenu.Content, {
@@ -41,12 +41,12 @@ const CustomContent = styled(DropdownMenu.Content, {
     return (
       <DropdownMenu.Root>
         <DropdownMenu.Trigger>
-          <></>
-          {/* <RIconButton
+          {/* <></> */}
+          <RIconButton
             backgroundColor="transparent"
             icon={<MaterialIcons name="more-horiz" size={25} />}
             style={{ padding: 0}}
-          /> */}
+          />
         </DropdownMenu.Trigger>
         <CustomContent>
           {dropdownItems.map(({label, onSelect = () => {}}) => (
@@ -63,12 +63,12 @@ const CustomContent = styled(DropdownMenu.Content, {
     return (
       <DropdownMenu.Root>
         <DropdownMenu.Trigger>
-          <></>
-          {/* <RIconButton
+          {/* <></> */}
+          <RIconButton
             backgroundColor="transparent"
             icon={<MaterialIcons name="more-horiz" size={25} />}
             style={{ padding: 0}}
-          /> */}
+          />
         </DropdownMenu.Trigger>
         <DropdownMenu.Content>
           {dropdownItems.map(({label, onSelect = () => {}}) => (

From e1991dd1dae7939e17b02f35934de79be885b255 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Tue, 9 Apr 2024 14:43:49 +0530
Subject: [PATCH 20/45] Upgrade react-reanimated version

---
 .../android/app/src/main/AndroidManifest.xml  |   2 -
 apps/expo/babel.config.js                     |   4 +-
 apps/expo/package.json                        |   3 +-
 eas.json                                      |  18 ----
 packages/app/screens/trip/steps.tsx           |   4 +-
 yarn.lock                                     | 102 ++++++++++++------
 6 files changed, 74 insertions(+), 59 deletions(-)
 delete mode 100644 eas.json

diff --git a/apps/expo/android/app/src/main/AndroidManifest.xml b/apps/expo/android/app/src/main/AndroidManifest.xml
index a13bbe6b9..93b702dca 100644
--- a/apps/expo/android/app/src/main/AndroidManifest.xml
+++ b/apps/expo/android/app/src/main/AndroidManifest.xml
@@ -8,8 +8,6 @@
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="android.permission.VIBRATE"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-  <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-  <uses-permission android:name="android.permission.USE_FINGERPRINT" />
   <queries>
     <intent>
       <action android:name="android.intent.action.VIEW"/>
diff --git a/apps/expo/babel.config.js b/apps/expo/babel.config.js
index 7dd98cd97..400d19b1a 100644
--- a/apps/expo/babel.config.js
+++ b/apps/expo/babel.config.js
@@ -12,7 +12,7 @@ module.exports = function (api) {
 
     plugins: [
       // NOTE: `expo-router/babel` is a temporary extension to `babel-preset-expo`.
-      'react-native-reanimated/plugin',
+      // 'react-native-reanimated/plugin',
       require.resolve('expo-router/babel'),
       [
         'module:react-native-dotenv',
@@ -44,6 +44,8 @@ module.exports = function (api) {
           include: 'TAMAGUI_TARGET',
         },
       ],
+      'react-native-reanimated/plugin',
+
     ],
   };
 };
diff --git a/apps/expo/package.json b/apps/expo/package.json
index 073fdda08..1c4a50195 100644
--- a/apps/expo/package.json
+++ b/apps/expo/package.json
@@ -90,7 +90,6 @@
     "expo-image-picker": "^14.7.1",
     "expo-linear-gradient": "~12.3.0",
     "expo-linking": "~5.0.2",
-    "expo-local-authentication": "~13.4.1",
     "expo-location": "~16.1.0",
     "expo-random": "~13.2.0",
     "expo-router": "^2.0.9",
@@ -121,7 +120,7 @@
     "react-native-ios-utilities": "^4.3.0",
     "react-native-paper": "^5.10.6",
     "react-native-paper-dates": "^0.18.12",
-    "react-native-reanimated": "~3.3.0",
+    "react-native-reanimated": "~3.8.1",
     "react-native-safe-area-context": "4.6.3",
     "react-native-screens": "~3.22.0",
     "react-native-select-dropdown": "^3.3.4",
diff --git a/eas.json b/eas.json
deleted file mode 100644
index 5e8a2be3f..000000000
--- a/eas.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "cli": {
-    "version": ">= 7.6.2"
-  },
-  "build": {
-    "development": {
-      "developmentClient": true,
-      "distribution": "internal"
-    },
-    "preview": {
-      "distribution": "internal"
-    },
-    "production": {}
-  },
-  "submit": {
-    "production": {}
-  }
-}
diff --git a/packages/app/screens/trip/steps.tsx b/packages/app/screens/trip/steps.tsx
index bac98dc76..0a5b12129 100644
--- a/packages/app/screens/trip/steps.tsx
+++ b/packages/app/screens/trip/steps.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import { FontAwesome5, FontAwesome } from '@expo/vector-icons';
 import { TripCard } from 'app/components/trip/TripCard';
-import { WeatherCard } from 'app/components/weather/WeatherCard';
+import WeatherCard from 'app/components/weather/WeatherCard';
 import { GearList } from 'app/components/GearList/GearList';
 import { SaveTripContainer } from 'app/components/trip/createTripModal';
-import { TripDateRange } from 'app/components/trip/TripDateRange';
+import TripDateRange  from 'app/components/trip/TripDateRange';
 import useTheme from 'app/hooks/useTheme';
 import useCustomStyles from 'app/hooks/useCustomStyles';
 import { useFetchWeather, useFetchWeatherWeak } from 'app/hooks/weather';
diff --git a/yarn.lock b/yarn.lock
index 79065efbd..ddeb9f1ff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -909,6 +909,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-arrow-functions@npm:^7.0.0-0":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/58f9aa9b0de8382f8cfa3f1f1d40b69d98cd2f52340e2391733d0af745fdddda650ba392e509bc056157c880a2f52834a38ab2c5aa5569af8c61bb6ecbf45f34
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-async-generator-functions@npm:^7.23.9":
   version: 7.23.9
   resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.9"
@@ -1240,6 +1251,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.0.0-0":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/74025e191ceb7cefc619c15d33753aab81300a03d81b96ae249d9b599bc65878f962d608f452462d3aad5d6e334b7ab2b09a6bdcfe8d101fe77ac7aacca4261e
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-nullish-coalescing-operator@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.23.4"
@@ -1264,17 +1287,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-assign@npm:^7.16.7":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-object-assign@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/17b8da5fe6cabc9f01adae9d57ad5a232a7535007249d737de3a120c73c63c330588ca5592419083d2b55df04c49b193d1ef5dbf071933fea11ac05022fd8716
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-object-rest-spread@npm:^7.24.0":
   version: 7.24.0
   resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.0"
@@ -1314,6 +1326,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-optional-chaining@npm:^7.0.0-0":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
+    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/d41031b8e472b9b30aacd905a1561904bcec597dd888ad639b234971714dc9cd0dcb60df91a89219fc72e4feeb148e20f97bcddc39d7676e743ff0c23f62a7eb
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-optional-chaining@npm:^7.23.3, @babel/plugin-transform-optional-chaining@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.4"
@@ -1496,6 +1521,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-shorthand-properties@npm:^7.0.0-0":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/006a2032d1c57dca76579ce6598c679c2f20525afef0a36e9d42affe3c8cf33c1427581ad696b519cc75dfee46c5e8ecdf0c6a29ffb14250caa3e16dd68cb424
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-spread@npm:^7.0.0, @babel/plugin-transform-spread@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-spread@npm:7.23.3"
@@ -1530,6 +1566,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-template-literals@npm:^7.0.0-0":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-template-literals@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/4c9009c72321caf20e3b6328bbe9d7057006c5ae57b794cf247a37ca34d87dfec5e27284169a16df5a6235a083bf0f3ab9e1bfcb005d1c8b75b04aed75652621
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-typeof-symbol@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-typeof-symbol@npm:7.23.3"
@@ -17221,7 +17268,6 @@ __metadata:
     expo-image-picker: "npm:^14.7.1"
     expo-linear-gradient: "npm:~12.3.0"
     expo-linking: "npm:~5.0.2"
-    expo-local-authentication: "npm:~13.4.1"
     expo-location: "npm:~16.1.0"
     expo-random: "npm:~13.2.0"
     expo-router: "npm:^2.0.9"
@@ -17253,7 +17299,7 @@ __metadata:
     react-native-ios-utilities: "npm:^4.3.0"
     react-native-paper: "npm:^5.10.6"
     react-native-paper-dates: "npm:^0.18.12"
-    react-native-reanimated: "npm:~3.3.0"
+    react-native-reanimated: "npm:~3.8.1"
     react-native-safe-area-context: "npm:4.6.3"
     react-native-screens: "npm:~3.22.0"
     react-native-select-dropdown: "npm:^3.3.4"
@@ -17539,17 +17585,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expo-local-authentication@npm:~13.4.1":
-  version: 13.4.1
-  resolution: "expo-local-authentication@npm:13.4.1"
-  dependencies:
-    invariant: "npm:^2.2.4"
-  peerDependencies:
-    expo: "*"
-  checksum: 10/2b002b3061ae3c234a6de54bf1f7b86b8c89b23707213dec54c630e31475abda15cdfced3beb737771859c320e89a2d56754b581941d3c5511dd2d734b1550a9
-  languageName: node
-  linkType: hard
-
 "expo-location@npm:~16.1.0":
   version: 16.1.0
   resolution: "expo-location@npm:16.1.0"
@@ -27601,24 +27636,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-reanimated@npm:~3.3.0":
-  version: 3.3.0
-  resolution: "react-native-reanimated@npm:3.3.0"
+"react-native-reanimated@npm:~3.8.1":
+  version: 3.8.1
+  resolution: "react-native-reanimated@npm:3.8.1"
   dependencies:
-    "@babel/plugin-transform-object-assign": "npm:^7.16.7"
+    "@babel/plugin-transform-arrow-functions": "npm:^7.0.0-0"
+    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.0.0-0"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.0.0-0"
+    "@babel/plugin-transform-shorthand-properties": "npm:^7.0.0-0"
+    "@babel/plugin-transform-template-literals": "npm:^7.0.0-0"
     "@babel/preset-typescript": "npm:^7.16.7"
     convert-source-map: "npm:^2.0.0"
     invariant: "npm:^2.2.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-    "@babel/plugin-proposal-nullish-coalescing-operator": ^7.0.0-0
-    "@babel/plugin-proposal-optional-chaining": ^7.0.0-0
-    "@babel/plugin-transform-arrow-functions": ^7.0.0-0
-    "@babel/plugin-transform-shorthand-properties": ^7.0.0-0
-    "@babel/plugin-transform-template-literals": ^7.0.0-0
     react: "*"
     react-native: "*"
-  checksum: 10/44496b834461dc6968f9add6a318d4ebc40c0989021fd4fab78832cef9507873cb7b9737ad2f7d9c8ac072b84870bfbddd2c27b94de4024d9103017388d7e3ed
+  checksum: 10/522635aed0ec2aa1c0887f34d770289ad8453f868ef6656c19eb4f5a35d0c264cb8e670ce6278433cb5597a8190165b3753ac52fc27ddb882d4467aae6f43117
   languageName: node
   linkType: hard
 

From 002e60f45160beee50f8c23a48e89e30a0219243 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Wed, 10 Apr 2024 12:00:13 +0530
Subject: [PATCH 21/45] Add preview.yml in github workflows

---
 .github/workflows/preview.yml | 41 +++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 .github/workflows/preview.yml

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
new file mode 100644
index 000000000..9fed050fb
--- /dev/null
+++ b/.github/workflows/preview.yml
@@ -0,0 +1,41 @@
+name: preview
+on: push
+
+jobs:
+  update:
+    name: EAS Update
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Check for EXPO_TOKEN
+        run: |
+          if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then
+            echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions"
+            exit 1
+          fi
+
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+          cache: yarn
+
+      - name: Setup EAS
+        uses: expo/expo-github-action@v8
+        with:
+          eas-version: latest
+          token: ${{ secrets.EXPO_TOKEN }}
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Create preview
+        uses: expo/expo-github-action/preview@v8
+        with:
+          command: cd apps/expo && eas update --auto
+u
\ No newline at end of file

From 17effa53bf9a9580babeb6b005eb87c4c14faddf Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Wed, 10 Apr 2024 12:07:01 +0530
Subject: [PATCH 22/45] changes in github workflows

---
 .github/workflows/build.yml       | 40 -------------
 .github/workflows/docker.node.yml | 28 ----------
 .github/workflows/expo.build.yml  | 57 -------------------
 .github/workflows/greetings.yml   | 16 ------
 .github/workflows/label.yml       | 22 --------
 .github/workflows/labeler.yml     | 42 --------------
 .github/workflows/manual.yml      | 32 -----------
 .github/workflows/node.js.dev.yml | 93 -------------------------------
 .github/workflows/node.js.yml     | 39 -------------
 .github/workflows/preview.yml     |  3 +-
 10 files changed, 1 insertion(+), 371 deletions(-)
 delete mode 100644 .github/workflows/build.yml
 delete mode 100644 .github/workflows/docker.node.yml
 delete mode 100644 .github/workflows/expo.build.yml
 delete mode 100644 .github/workflows/greetings.yml
 delete mode 100644 .github/workflows/label.yml
 delete mode 100644 .github/workflows/labeler.yml
 delete mode 100644 .github/workflows/manual.yml
 delete mode 100644 .github/workflows/node.js.dev.yml
 delete mode 100644 .github/workflows/node.js.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index d3ae59190..000000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: android-build-apk
-
-on:
-  push:
-    branches: [ "**" ]
-  pull_request:
-    branches: [ "**" ]
-  
-
-jobs:
-  install-and-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-
-      - name: Install yarn dependencies
-        run: |
-          yarn install
-
-
-  build-android:
-    needs: install-and-test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install yarn dependencies
-        run: |
-          yarn install
-
-      - name: Build Android Release
-        run: |
-          cd apps/expo/android && ./gradlew assembleRelease
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v1
-        with:
-          name: app-release.apk
-          path: android/app/build/outputs/apk/release/
\ No newline at end of file
diff --git a/.github/workflows/docker.node.yml b/.github/workflows/docker.node.yml
deleted file mode 100644
index 56539843c..000000000
--- a/.github/workflows/docker.node.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Docker Image CI
-
-on:
-  push:
-    branches:
-      - master
-      - dev
-      - andrew_testing
-      - release/*
-  pull_request:
-    branches:
-      - master
-      - dev
-      - andrew_testing
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-
-    - name: Build Docker image
-      run: docker build -t packrat-app -f Dockerfile.prod .
\ No newline at end of file
diff --git a/.github/workflows/expo.build.yml b/.github/workflows/expo.build.yml
deleted file mode 100644
index b08e5ed8c..000000000
--- a/.github/workflows/expo.build.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-name: EAS Local Build
-
-on: push
-  # push:
-  #   branches: [ "**" ]
-  # pull_request:
-  #   branches: [ "**" ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    - name: Install Node.js
-      uses: actions/setup-node@v2
-      with:
-        node-version: 20.x # Use the version you prefer
-        cache : yarn 
-
-    - name: 🏗 Setup EAS
-      uses: expo/expo-github-action@v8
-      with:
-        eas-version: latest
-        token: ${{ secrets.EXPO_TOKEN }}
-
-    - name: Set up Yarn
-      run: yarn install
-
-    # - name: 🚀 Build app
-    #   working-directory: ./client
-    #   run: eas build --non-interactive --platform all --local
-
-#    - name: Install dependencies
-#      working-directory: ./client
-#      run: yarn install
-
-#    - name: Install EAS CLI
-#      run: yarn global add eas-cli
-
-#    - name: Configure build
-#      working-directory: ./client
-#      run: npx eas build:configure
-
-    # If you need additional setup or configurations, add them here
-
-     
-
-    - name: Run Local Build for Android
-      # working-directory: ./apps/expo
-      run: eas build --non-interactive --platform android --local
-
-    - name: Run Local Build for iOS
-      # working-directory: ./apps/expo
-      run: eas build --non-interactive --platform ios --local
\ No newline at end of file
diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
deleted file mode 100644
index 46774343e..000000000
--- a/.github/workflows/greetings.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Greetings
-
-on: [pull_request_target, issues]
-
-jobs:
-  greeting:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-    steps:
-    - uses: actions/first-interaction@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        issue-message: "Message that will be displayed on users' first issue"
-        pr-message: "Message that will be displayed on users' first pull request"
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
deleted file mode 100644
index 461356907..000000000
--- a/.github/workflows/label.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# This workflow will triage pull requests and apply a label based on the
-# paths that are modified in the pull request.
-#
-# To use this workflow, you will need to set up a .github/labeler.yml
-# file with configuration.  For more information, see:
-# https://github.com/actions/labeler
-
-name: Labeler
-on: [pull_request_target]
-
-jobs:
-  label:
-
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-
-    steps:
-    - uses: actions/labeler@v4
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
deleted file mode 100644
index 01b0da161..000000000
--- a/.github/workflows/labeler.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Add 'repo' label to any root file changes
-repo:
-  - '*'
-
-# Add 'test' label to any change to *.spec.ts and *.spec.js files within the entire repository
-test:
-  - '**/*.spec.ts'
-  - '**/*.spec.js'
-
-# Add 'frontend' label to any change in the 'client' directory
-frontend:
-  - 'client/**/*.{ts,js}'
-  - any: ['client/**/*.ts', 'client/**/*.js']
-    all: ['!client/src/main.ts', '!client/src/main.js']
-
-# Add 'backend' label to any change in the 'server' directory
-backend:
-  - 'server/**/*.{ts,js}'
-
-# Add the 'AnyChange' label to any changes within the entire repository
-AnyChange:
-  - '**'
-  - '**/.*'
-  - '**/.*/**'
-  - '**/.*/**/.*'
-
-# Workflow configuration starts here
-
-name: Pull request labeler
-on: [ pull_request_target ]
-
-jobs:
-  triage:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-    steps:
-      - uses: actions/labeler@v4
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
deleted file mode 100644
index 11b2e3558..000000000
--- a/.github/workflows/manual.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-# This is a basic workflow that is manually triggered
-
-name: Manual workflow
-
-# Controls when the action will run. Workflow runs when manually triggered using the UI
-# or API.
-on:
-  workflow_dispatch:
-    # Inputs the workflow accepts.
-    inputs:
-      name:
-        # Friendly description to be shown in the UI instead of 'name'
-        description: 'Person to greet'
-        # Default value if no value is explicitly provided
-        default: 'World'
-        # Input has to be provided for the workflow to run
-        required: true
-        # The data type of the input
-        type: string
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "greet"
-  greet:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-    # Runs a single command using the runners shell
-    - name: Send greeting
-      run: echo "Hello ${{ inputs.name }}"
diff --git a/.github/workflows/node.js.dev.yml b/.github/workflows/node.js.dev.yml
deleted file mode 100644
index de347340f..000000000
--- a/.github/workflows/node.js.dev.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-name: Node.js CI for Development Environment
-
-on:
-  push:
-    branches: [ "**" ] # adjust this to the branches you want to run CI on
-  pull_request:
-    branches: [ "**" ]
-
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest] # Operating systems
-        node-version: [18.x, 20.x, 21.x] # Node.js versions
-
-    steps:
-    - name: Checkout Repository
-      uses: actions/checkout@v3
-
-    - name: Setup Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ matrix.node-version }}
-
-    - name: Debug Information
-      run: |
-        yarn -v
-        ls .yarn/releases
-        cat .yarnrc.yml
-        cat yarn.lock
-
-    - name: ⚙️ Enable Corepack
-      run: |
-        corepack enable
-        echo "corepack enabled"
-
-    - name: Set Yarn Version to Berry
-      run: yarn set version berry
-
-    #   run: yarn policies set-version
-
-    - name: Install dependencies
-      run: yarn install
-
-    - name: Debug more
-      run: |
-        yarn -v
-        yarn info packrat-world@workspace:.
-        yarn workspaces list --json
-
-    - name: Run setup
-      run: |
-        yarn -v
-        which yarn
-        yarn set version stable
-        yarn install
-
-# cp client/.env.example client/.env
-# cp client/app.json.example client/app.json
-# cp server/.env.example server/.env
-
-# yarn setup
-
-    # - name: Clean Cache and Reinstall
-    #   run: |
-    #     yarn cache clean
-    #     yarn install --immutable
-
-    - name: Start Server in Background
-      run: |
-        cd server
-        yarn start &
-
-    - name: Start Expo in Background
-      run: |
-        cd apps/expo
-        yarn web &
-
-    - name: Wait for a while
-      run: sleep 120  # wait for some time to let the server start
-
-    - name: Kill Background Jobs (Unix)
-      if: matrix.os != 'windows-latest'
-      run: kill $(jobs -p) || true
-
-    - name: Kill Background Jobs (Windows)
-      if: matrix.os == 'windows-latest'
-      run: |
-        Get-Job | Stop-Job
-        Get-Job | Remove-Job
-
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
deleted file mode 100644
index b8972641e..000000000
--- a/.github/workflows/node.js.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
-
-name: Node.js CI
-
-on:
-  push:
-    branches: [ "**" ]
-  pull_request:
-    branches: [ "**" ]
-
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest] # Operating systems
-        node-version: [18.x, 20.x, 21.x] # Node.js versions
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Lint code
-        run: yarn lint
-
-      - name: Run tests
-        continue-on-error: true
-        run: yarn test
-
-      - name: Build
-        run: yarn build:prod
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 9fed050fb..f1e2b57c6 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -37,5 +37,4 @@ jobs:
       - name: Create preview
         uses: expo/expo-github-action/preview@v8
         with:
-          command: cd apps/expo && eas update --auto
-u
\ No newline at end of file
+          command: cd apps/expo && eas update --auto
\ No newline at end of file

From 6a2b461755c01b979598b5518fab3724c38f048f Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Wed, 10 Apr 2024 12:13:46 +0530
Subject: [PATCH 23/45] changes in github workflows2

---
 .github/workflows/preview.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index f1e2b57c6..ff3aef763 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -37,4 +37,4 @@ jobs:
       - name: Create preview
         uses: expo/expo-github-action/preview@v8
         with:
-          command: cd apps/expo && eas update --auto
\ No newline at end of file
+          command: eas update --auto
\ No newline at end of file

From 242a32def863e243b8d4ba5b83b034b0e78f8b54 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Wed, 10 Apr 2024 12:18:41 +0530
Subject: [PATCH 24/45] changes in github workflows3

---
 .github/workflows/preview.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index ff3aef763..7015cc42b 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.x
           cache: yarn
 
       - name: Setup EAS

From 80e37c4b7efec1c0c24c9f882f33f092fd91f277 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Wed, 10 Apr 2024 12:25:16 +0530
Subject: [PATCH 25/45] changes in github workflows4

---
 .github/workflows/preview.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 7015cc42b..2e9659f5b 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -37,4 +37,5 @@ jobs:
       - name: Create preview
         uses: expo/expo-github-action/preview@v8
         with:
+          working-directory: apps/expo
           command: eas update --auto
\ No newline at end of file

From de957ab0c8c9c85c0692e4748d51caffaa9b8078 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Wed, 10 Apr 2024 12:31:25 +0530
Subject: [PATCH 26/45] changes in github workflows5

---
 .github/workflows/preview.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 2e9659f5b..3618a110f 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -38,4 +38,4 @@ jobs:
         uses: expo/expo-github-action/preview@v8
         with:
           working-directory: apps/expo
-          command: eas update --auto
\ No newline at end of file
+          command: eas build --auto
\ No newline at end of file

From b6f4c04e6eab9aa7c1a55884fb688a19a450b21a Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Wed, 10 Apr 2024 12:38:00 +0530
Subject: [PATCH 27/45] changes in github workflows 6

---
 .github/workflows/preview.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 3618a110f..e35ca51f0 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -38,4 +38,4 @@ jobs:
         uses: expo/expo-github-action/preview@v8
         with:
           working-directory: apps/expo
-          command: eas build --auto
\ No newline at end of file
+          command: eas build --platform android --profile preview
\ No newline at end of file

From 96db9a09c2c1eab23c6ffae397214fc650d0737d Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Thu, 11 Apr 2024 17:47:11 +0530
Subject: [PATCH 28/45] changes in github workflows 7

---
 .github/workflows/expo.build.yml | 54 ++++++++++++++++++++++++++++++++
 .github/workflows/label.yml      | 22 +++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 .github/workflows/expo.build.yml
 create mode 100644 .github/workflows/label.yml

diff --git a/.github/workflows/expo.build.yml b/.github/workflows/expo.build.yml
new file mode 100644
index 000000000..f8f291f01
--- /dev/null
+++ b/.github/workflows/expo.build.yml
@@ -0,0 +1,54 @@
+name: EAS Local Build
+
+on:
+  push:
+    branches: [ "**" ]
+  pull_request:
+    branches: [ "**" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Install Node.js
+      uses: actions/setup-node@v2
+      with:
+        node-version: '20' # Use the version you prefer
+
+    - name: 🏗 Setup EAS
+      uses: expo/expo-github-action@v8
+      with:
+        eas-version: latest
+        token: ${{ secrets.EXPO_TOKEN }}
+
+    - name: Set up Yarn
+      run: yarn
+
+    # - name: 🚀 Build app
+    #   working-directory: ./client
+    #   run: eas build --non-interactive --platform all --local
+
+#    - name: Install dependencies
+#      working-directory: ./client
+#      run: yarn install
+
+#    - name: Install EAS CLI
+#      run: yarn global add eas-cli
+
+#    - name: Configure build
+#      working-directory: ./client
+#      run: npx eas build:configure
+
+    # If you need additional setup or configurations, add them here
+
+    - name: Run Local Build for Android
+      working-directory: ./apps/expo
+      run: eas build --non-interactive --platform android --local
+
+    - name: Run Local Build for iOS
+      working-directory: ./apps/expo
+      run: eas build --non-interactive --platform ios --local
\ No newline at end of file
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
new file mode 100644
index 000000000..461356907
--- /dev/null
+++ b/.github/workflows/label.yml
@@ -0,0 +1,22 @@
+# This workflow will triage pull requests and apply a label based on the
+# paths that are modified in the pull request.
+#
+# To use this workflow, you will need to set up a .github/labeler.yml
+# file with configuration.  For more information, see:
+# https://github.com/actions/labeler
+
+name: Labeler
+on: [pull_request_target]
+
+jobs:
+  label:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+
+    steps:
+    - uses: actions/labeler@v4
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

From bb960ccf06c63f9866bd6572187606a79f765503 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Thu, 11 Apr 2024 17:48:34 +0530
Subject: [PATCH 29/45] changes in github workflows8

---
 .github/workflows/build.yml       | 31 +++++++++++
 .github/workflows/docker.node.yml | 28 ++++++++++
 .github/workflows/labeler.yml     | 42 ++++++++++++++
 .github/workflows/manual.yml      | 32 +++++++++++
 .github/workflows/node.js.dev.yml | 93 +++++++++++++++++++++++++++++++
 .github/workflows/node.js.yml     | 39 +++++++++++++
 .github/workflows/preview.yml     |  8 ++-
 7 files changed, 271 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/build.yml
 create mode 100644 .github/workflows/docker.node.yml
 create mode 100644 .github/workflows/labeler.yml
 create mode 100644 .github/workflows/manual.yml
 create mode 100644 .github/workflows/node.js.dev.yml
 create mode 100644 .github/workflows/node.js.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000000000..4f1acdda6
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,31 @@
+name: android-build-apk
+on:
+  push:
+    branches: [ "**" ]
+  pull_request:
+    branches: [ "**" ]
+
+jobs:
+  install-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install yarn dependencies
+        run: |
+          yarn install
+  build-android:
+    needs: install-and-test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install yarn dependencies
+        run: |
+          yarn install
+      - name: Build Android Release
+        run: |
+          cd client/android && ./gradlew assembleRelease
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: app-release.apk
+          path: android/app/build/outputs/apk/release/
\ No newline at end of file
diff --git a/.github/workflows/docker.node.yml b/.github/workflows/docker.node.yml
new file mode 100644
index 000000000..56539843c
--- /dev/null
+++ b/.github/workflows/docker.node.yml
@@ -0,0 +1,28 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches:
+      - master
+      - dev
+      - andrew_testing
+      - release/*
+  pull_request:
+    branches:
+      - master
+      - dev
+      - andrew_testing
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Build Docker image
+      run: docker build -t packrat-app -f Dockerfile.prod .
\ No newline at end of file
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
new file mode 100644
index 000000000..01b0da161
--- /dev/null
+++ b/.github/workflows/labeler.yml
@@ -0,0 +1,42 @@
+# Add 'repo' label to any root file changes
+repo:
+  - '*'
+
+# Add 'test' label to any change to *.spec.ts and *.spec.js files within the entire repository
+test:
+  - '**/*.spec.ts'
+  - '**/*.spec.js'
+
+# Add 'frontend' label to any change in the 'client' directory
+frontend:
+  - 'client/**/*.{ts,js}'
+  - any: ['client/**/*.ts', 'client/**/*.js']
+    all: ['!client/src/main.ts', '!client/src/main.js']
+
+# Add 'backend' label to any change in the 'server' directory
+backend:
+  - 'server/**/*.{ts,js}'
+
+# Add the 'AnyChange' label to any changes within the entire repository
+AnyChange:
+  - '**'
+  - '**/.*'
+  - '**/.*/**'
+  - '**/.*/**/.*'
+
+# Workflow configuration starts here
+
+name: Pull request labeler
+on: [ pull_request_target ]
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - uses: actions/labeler@v4
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
new file mode 100644
index 000000000..11b2e3558
--- /dev/null
+++ b/.github/workflows/manual.yml
@@ -0,0 +1,32 @@
+# This is a basic workflow that is manually triggered
+
+name: Manual workflow
+
+# Controls when the action will run. Workflow runs when manually triggered using the UI
+# or API.
+on:
+  workflow_dispatch:
+    # Inputs the workflow accepts.
+    inputs:
+      name:
+        # Friendly description to be shown in the UI instead of 'name'
+        description: 'Person to greet'
+        # Default value if no value is explicitly provided
+        default: 'World'
+        # Input has to be provided for the workflow to run
+        required: true
+        # The data type of the input
+        type: string
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "greet"
+  greet:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Runs a single command using the runners shell
+    - name: Send greeting
+      run: echo "Hello ${{ inputs.name }}"
diff --git a/.github/workflows/node.js.dev.yml b/.github/workflows/node.js.dev.yml
new file mode 100644
index 000000000..de347340f
--- /dev/null
+++ b/.github/workflows/node.js.dev.yml
@@ -0,0 +1,93 @@
+name: Node.js CI for Development Environment
+
+on:
+  push:
+    branches: [ "**" ] # adjust this to the branches you want to run CI on
+  pull_request:
+    branches: [ "**" ]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest] # Operating systems
+        node-version: [18.x, 20.x, 21.x] # Node.js versions
+
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v3
+
+    - name: Setup Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - name: Debug Information
+      run: |
+        yarn -v
+        ls .yarn/releases
+        cat .yarnrc.yml
+        cat yarn.lock
+
+    - name: ⚙️ Enable Corepack
+      run: |
+        corepack enable
+        echo "corepack enabled"
+
+    - name: Set Yarn Version to Berry
+      run: yarn set version berry
+
+    #   run: yarn policies set-version
+
+    - name: Install dependencies
+      run: yarn install
+
+    - name: Debug more
+      run: |
+        yarn -v
+        yarn info packrat-world@workspace:.
+        yarn workspaces list --json
+
+    - name: Run setup
+      run: |
+        yarn -v
+        which yarn
+        yarn set version stable
+        yarn install
+
+# cp client/.env.example client/.env
+# cp client/app.json.example client/app.json
+# cp server/.env.example server/.env
+
+# yarn setup
+
+    # - name: Clean Cache and Reinstall
+    #   run: |
+    #     yarn cache clean
+    #     yarn install --immutable
+
+    - name: Start Server in Background
+      run: |
+        cd server
+        yarn start &
+
+    - name: Start Expo in Background
+      run: |
+        cd apps/expo
+        yarn web &
+
+    - name: Wait for a while
+      run: sleep 120  # wait for some time to let the server start
+
+    - name: Kill Background Jobs (Unix)
+      if: matrix.os != 'windows-latest'
+      run: kill $(jobs -p) || true
+
+    - name: Kill Background Jobs (Windows)
+      if: matrix.os == 'windows-latest'
+      run: |
+        Get-Job | Stop-Job
+        Get-Job | Remove-Job
+
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
new file mode 100644
index 000000000..b8972641e
--- /dev/null
+++ b/.github/workflows/node.js.yml
@@ -0,0 +1,39 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ "**" ]
+  pull_request:
+    branches: [ "**" ]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest] # Operating systems
+        node-version: [18.x, 20.x, 21.x] # Node.js versions
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Lint code
+        run: yarn lint
+
+      - name: Run tests
+        continue-on-error: true
+        run: yarn test
+
+      - name: Build
+        run: yarn build:prod
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index e35ca51f0..2c9ac804b 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -1,9 +1,13 @@
 name: preview
-on: push
+on: 
+  push:
+    branches: [ "**" ]
+  pull_request:
+    branches: [ "**" ]
 
 jobs:
   update:
-    name: EAS Update
+    name: EAS Android Preview Build
     runs-on: ubuntu-latest
     permissions:
       contents: read

From f9199aa206b37a101f7e40ba0b95ef2129e9e3b6 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Thu, 11 Apr 2024 17:59:56 +0530
Subject: [PATCH 30/45] changes in github workflows9

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4f1acdda6..5634a5e35 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
           yarn install
       - name: Build Android Release
         run: |
-          cd client/android && ./gradlew assembleRelease
+          cd apps/expo/android && ./gradlew assembleRelease
       - name: Upload Artifact
         uses: actions/upload-artifact@v1
         with:

From b0e90f2252c761b319910318371efeb103ffd14d Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Thu, 11 Apr 2024 18:29:12 +0530
Subject: [PATCH 31/45] changes in github workflows10

---
 .github/workflows/build.yml   |  2 +-
 .github/workflows/preview.yml | 45 -----------------------------------
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 .github/workflows/preview.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5634a5e35..4f1acdda6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
           yarn install
       - name: Build Android Release
         run: |
-          cd apps/expo/android && ./gradlew assembleRelease
+          cd client/android && ./gradlew assembleRelease
       - name: Upload Artifact
         uses: actions/upload-artifact@v1
         with:
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
deleted file mode 100644
index 2c9ac804b..000000000
--- a/.github/workflows/preview.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: preview
-on: 
-  push:
-    branches: [ "**" ]
-  pull_request:
-    branches: [ "**" ]
-
-jobs:
-  update:
-    name: EAS Android Preview Build
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-    steps:
-      - name: Check for EXPO_TOKEN
-        run: |
-          if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then
-            echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions"
-            exit 1
-          fi
-
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20.x
-          cache: yarn
-
-      - name: Setup EAS
-        uses: expo/expo-github-action@v8
-        with:
-          eas-version: latest
-          token: ${{ secrets.EXPO_TOKEN }}
-
-      - name: Install dependencies
-        run: yarn install
-
-      - name: Create preview
-        uses: expo/expo-github-action/preview@v8
-        with:
-          working-directory: apps/expo
-          command: eas build --platform android --profile preview
\ No newline at end of file

From f5fc8590d398e96d422f9fe22068f731aa7cb322 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Thu, 11 Apr 2024 18:29:58 +0530
Subject: [PATCH 32/45] changes in github workflows11

---
 .github/workflows/android-preview-build.yml | 45 +++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 .github/workflows/android-preview-build.yml

diff --git a/.github/workflows/android-preview-build.yml b/.github/workflows/android-preview-build.yml
new file mode 100644
index 000000000..4162d8d85
--- /dev/null
+++ b/.github/workflows/android-preview-build.yml
@@ -0,0 +1,45 @@
+name: android-preview-build
+on: 
+  push:
+    branches: [ "**" ]
+  pull_request:
+    branches: [ "**" ]
+
+jobs:
+  update:
+    name: EAS Android Preview Build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Check for EXPO_TOKEN
+        run: |
+          if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then
+            echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions"
+            exit 1
+          fi
+
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20.x
+          cache: yarn
+
+      - name: Setup EAS
+        uses: expo/expo-github-action@v8
+        with:
+          eas-version: latest
+          token: ${{ secrets.EXPO_TOKEN }}
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Create preview
+        uses: expo/expo-github-action/preview@v8
+        with:
+          working-directory: apps/expo
+          command: eas build --platform android --profile preview
\ No newline at end of file

From f4a808308f3af50dc22a84a75e3d8dc7d8c58feb Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Thu, 11 Apr 2024 18:42:35 +0530
Subject: [PATCH 33/45] changes in github workflows12

---
 .github/workflows/greetings.yml | 16 ++++++++++++++++
 app.json                        |  3 ---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/greetings.yml
 delete mode 100644 app.json

diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
new file mode 100644
index 000000000..46774343e
--- /dev/null
+++ b/.github/workflows/greetings.yml
@@ -0,0 +1,16 @@
+name: Greetings
+
+on: [pull_request_target, issues]
+
+jobs:
+  greeting:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+    - uses: actions/first-interaction@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        issue-message: "Message that will be displayed on users' first issue"
+        pr-message: "Message that will be displayed on users' first pull request"
diff --git a/app.json b/app.json
deleted file mode 100644
index c9e8c8a40..000000000
--- a/app.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "expo": {}
-}
\ No newline at end of file

From 1253acca48c1d6f7036b637aa68838c29874ab09 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Thu, 11 Apr 2024 18:51:34 +0530
Subject: [PATCH 34/45] changes in github workflows13

---
 apps/expo/eas.json | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/apps/expo/eas.json b/apps/expo/eas.json
index 508891ea2..276296a65 100644
--- a/apps/expo/eas.json
+++ b/apps/expo/eas.json
@@ -23,14 +23,6 @@
     "production": {
       "ios": {
         "resourceClass": "m-medium"
-      },
-      "env": {
-        "EXPO_PUBLIC_API_URL": "https://api.production.com"
-      }
-    },
-    "test": {
-      "env": {
-        "EXPO_PUBLIC_API_URL": "https://api.test.com"
       }
     }
   },

From d8a45d6e2a28f6919b091d2b2cd020ba6bb7619f Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Thu, 11 Apr 2024 19:30:27 +0530
Subject: [PATCH 35/45] changes in github workflow14

---
 packages/ui/src/ZDropdown/index.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/ui/src/ZDropdown/index.tsx b/packages/ui/src/ZDropdown/index.tsx
index 7820db7c1..051aa0105 100644
--- a/packages/ui/src/ZDropdown/index.tsx
+++ b/packages/ui/src/ZDropdown/index.tsx
@@ -41,7 +41,6 @@ const CustomContent = styled(DropdownMenu.Content, {
     return (
       <DropdownMenu.Root>
         <DropdownMenu.Trigger>
-          {/* <></> */}
           <RIconButton
             backgroundColor="transparent"
             icon={<MaterialIcons name="more-horiz" size={25} />}
@@ -63,7 +62,6 @@ const CustomContent = styled(DropdownMenu.Content, {
     return (
       <DropdownMenu.Root>
         <DropdownMenu.Trigger>
-          {/* <></> */}
           <RIconButton
             backgroundColor="transparent"
             icon={<MaterialIcons name="more-horiz" size={25} />}

From 29c1db7252f04cefc365c10b6970cdbc285586ba Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Thu, 11 Apr 2024 22:52:49 +0530
Subject: [PATCH 36/45] changes in app.config

---
 apps/expo/app.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/expo/app.config.js b/apps/expo/app.config.js
index bb716c425..01351c6a9 100644
--- a/apps/expo/app.config.js
+++ b/apps/expo/app.config.js
@@ -7,7 +7,7 @@ module.exports = ({ config }) => {
                 "@rnmapbox/maps",
                 {
                   "RNMapboxMapsImpl": "mapbox",
-                  "RNMapboxMapsDownloadToken": process.env.MAPBOX_DOWNLOADS_TOKEN2
+                  "RNMapboxMapsDownloadToken": process.env.MAPBOX_DOWNLOADS_TOKEN
                 }
               ]
         }

From f5e49bc5ae6f7c9718401d399c5d0755c34ffdb3 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sat, 13 Apr 2024 11:05:46 +0530
Subject: [PATCH 37/45] changes in workflows

---
 ...id-preview-build.yml => android-preview-build-local.yml} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename .github/workflows/{android-preview-build.yml => android-preview-build-local.yml} (92%)

diff --git a/.github/workflows/android-preview-build.yml b/.github/workflows/android-preview-build-local.yml
similarity index 92%
rename from .github/workflows/android-preview-build.yml
rename to .github/workflows/android-preview-build-local.yml
index 4162d8d85..e47c0a06a 100644
--- a/.github/workflows/android-preview-build.yml
+++ b/.github/workflows/android-preview-build-local.yml
@@ -1,4 +1,4 @@
-name: android-preview-build
+name: android-preview-build-local
 on: 
   push:
     branches: [ "**" ]
@@ -7,7 +7,7 @@ on:
 
 jobs:
   update:
-    name: EAS Android Preview Build
+    name: EAS Android Preview Build Local
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -42,4 +42,4 @@ jobs:
         uses: expo/expo-github-action/preview@v8
         with:
           working-directory: apps/expo
-          command: eas build --platform android --profile preview
\ No newline at end of file
+          command: eas build --platform android --profile preview --local
\ No newline at end of file

From d1299178cc69a0ed75102a140f58ecd1f3638a93 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sat, 13 Apr 2024 11:27:55 +0530
Subject: [PATCH 38/45] Workflow changes

---
 .github/workflows/android-preview-build-local.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android-preview-build-local.yml b/.github/workflows/android-preview-build-local.yml
index e47c0a06a..2aabc468c 100644
--- a/.github/workflows/android-preview-build-local.yml
+++ b/.github/workflows/android-preview-build-local.yml
@@ -42,4 +42,4 @@ jobs:
         uses: expo/expo-github-action/preview@v8
         with:
           working-directory: apps/expo
-          command: eas build --platform android --profile preview --local
\ No newline at end of file
+          command: eas build --non-interactive --platform android --local

From 909befa1d047e2ab92f9d1b46aadf4280500e731 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sat, 13 Apr 2024 11:34:57 +0530
Subject: [PATCH 39/45] Workflow changes1

---
 .github/workflows/android-preview-build-local.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android-preview-build-local.yml b/.github/workflows/android-preview-build-local.yml
index 2aabc468c..d3497aa28 100644
--- a/.github/workflows/android-preview-build-local.yml
+++ b/.github/workflows/android-preview-build-local.yml
@@ -42,4 +42,4 @@ jobs:
         uses: expo/expo-github-action/preview@v8
         with:
           working-directory: apps/expo
-          command: eas build --non-interactive --platform android --local
+          command: eas build --non-interactive --platform android --profile preview --local

From 1b8b4b0b2a9b414dac95f79905949ab06b1a4f91 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sat, 13 Apr 2024 16:44:49 +0530
Subject: [PATCH 40/45] Workflow changes2

---
 ...w-build-local.yml => android-preview-build.yml} | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
 rename .github/workflows/{android-preview-build-local.yml => android-preview-build.yml} (80%)

diff --git a/.github/workflows/android-preview-build-local.yml b/.github/workflows/android-preview-build.yml
similarity index 80%
rename from .github/workflows/android-preview-build-local.yml
rename to .github/workflows/android-preview-build.yml
index d3497aa28..26fda0f2a 100644
--- a/.github/workflows/android-preview-build-local.yml
+++ b/.github/workflows/android-preview-build.yml
@@ -1,13 +1,9 @@
-name: android-preview-build-local
-on: 
-  push:
-    branches: [ "**" ]
-  pull_request:
-    branches: [ "**" ]
-
+name: android-preview-build
+on: workflow_dispatch 
+  
 jobs:
   update:
-    name: EAS Android Preview Build Local
+    name: EAS Android Preview Build
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -42,4 +38,4 @@ jobs:
         uses: expo/expo-github-action/preview@v8
         with:
           working-directory: apps/expo
-          command: eas build --non-interactive --platform android --profile preview --local
+          command: eas build --platform android --profile preview

From b1734c5b56febdc9c9dca9105d6d8e9cfe170db0 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sat, 13 Apr 2024 16:59:46 +0530
Subject: [PATCH 41/45] Workflow changes2.0

---
 ...preview-build.yml => android-preview-build-local.yml} | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
 rename .github/workflows/{android-preview-build.yml => android-preview-build-local.yml} (93%)

diff --git a/.github/workflows/android-preview-build.yml b/.github/workflows/android-preview-build-local.yml
similarity index 93%
rename from .github/workflows/android-preview-build.yml
rename to .github/workflows/android-preview-build-local.yml
index 26fda0f2a..e4a1165bb 100644
--- a/.github/workflows/android-preview-build.yml
+++ b/.github/workflows/android-preview-build-local.yml
@@ -1,5 +1,10 @@
 name: android-preview-build
-on: workflow_dispatch 
+on: 
+  push:
+  branches: [ "**" ]
+pull_request:
+  branches: [ "**" ]
+
   
 jobs:
   update:
@@ -38,4 +43,4 @@ jobs:
         uses: expo/expo-github-action/preview@v8
         with:
           working-directory: apps/expo
-          command: eas build --platform android --profile preview
+          command: eas build --platform android --profile preview --local

From fd4308dde2a9dbb33f072ef371a0b27806ff53e1 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sat, 13 Apr 2024 17:01:16 +0530
Subject: [PATCH 42/45] Workflow changes2.1

---
 .github/workflows/android-preview-build-local.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android-preview-build-local.yml b/.github/workflows/android-preview-build-local.yml
index e4a1165bb..42b5fb996 100644
--- a/.github/workflows/android-preview-build-local.yml
+++ b/.github/workflows/android-preview-build-local.yml
@@ -1,4 +1,4 @@
-name: android-preview-build
+name: android-preview-build-local
 on: 
   push:
   branches: [ "**" ]

From 5f7250738d5df24ee29bfdfd2bbe426399f1b16c Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sat, 13 Apr 2024 17:08:01 +0530
Subject: [PATCH 43/45] workflow changes2.3

---
 .github/workflows/android-preview-build-local.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/android-preview-build-local.yml b/.github/workflows/android-preview-build-local.yml
index 42b5fb996..95622ce69 100644
--- a/.github/workflows/android-preview-build-local.yml
+++ b/.github/workflows/android-preview-build-local.yml
@@ -1,9 +1,10 @@
 name: android-preview-build-local
 on: 
   push:
-  branches: [ "**" ]
-pull_request:
-  branches: [ "**" ]
+    branches: [ "**" ]
+  pull_request:
+    branches: [ "**" ]
+
 
   
 jobs:

From 68f9115502afacaf918f671b9c21f92102700770 Mon Sep 17 00:00:00 2001
From: Anmol Verma <anmolverma2810@gmail.com>
Date: Sat, 13 Apr 2024 17:23:42 +0530
Subject: [PATCH 44/45] Add manual build workflow

---
 .github/workflows/android-build-manual.yml    | 49 +++++++++++++++++++
 .../workflows/android-preview-build-local.yml |  2 +-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/android-build-manual.yml

diff --git a/.github/workflows/android-build-manual.yml b/.github/workflows/android-build-manual.yml
new file mode 100644
index 000000000..a52852034
--- /dev/null
+++ b/.github/workflows/android-build-manual.yml
@@ -0,0 +1,49 @@
+name: android build manual
+
+on:
+  workflow_dispatch:
+    inputs:
+      name:
+        description: 'Build manually'
+        default: 'World'
+        required: true
+        type: string
+
+jobs:
+  update:
+    name: EAS Android Preview Build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Check for EXPO_TOKEN
+        run: |
+          if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then
+            echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions"
+            exit 1
+          fi
+
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20.x
+          cache: yarn
+
+      - name: Setup EAS
+        uses: expo/expo-github-action@v8
+        with:
+          eas-version: latest
+          token: ${{ secrets.EXPO_TOKEN }}
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Create preview
+        uses: expo/expo-github-action/preview@v8
+        with:
+          working-directory: apps/expo
+          command: eas build --platform android --profile preview 
\ No newline at end of file
diff --git a/.github/workflows/android-preview-build-local.yml b/.github/workflows/android-preview-build-local.yml
index 95622ce69..b3be73155 100644
--- a/.github/workflows/android-preview-build-local.yml
+++ b/.github/workflows/android-preview-build-local.yml
@@ -9,7 +9,7 @@ on:
   
 jobs:
   update:
-    name: EAS Android Preview Build
+    name: EAS Android Preview Build Local
     runs-on: ubuntu-latest
     permissions:
       contents: read

From e3e5bb05313feaee10e8be992f55a4b1c3c8d26e Mon Sep 17 00:00:00 2001
From: Andrew Bierman <94939237+andrew-bierman@users.noreply.github.com>
Date: Wed, 17 Apr 2024 20:52:41 -0400
Subject: [PATCH 45/45] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20regen=20lock?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yarn.lock | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 25016c658..19b60ec23 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -899,7 +899,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-arrow-functions@npm:^7.0.0, @babel/plugin-transform-arrow-functions@npm:^7.24.1":
+"@babel/plugin-transform-arrow-functions@npm:^7.0.0, @babel/plugin-transform-arrow-functions@npm:^7.0.0-0, @babel/plugin-transform-arrow-functions@npm:^7.24.1":
   version: 7.24.1
   resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.1"
   dependencies:
@@ -1241,7 +1241,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.1":
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.0.0-0, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.1":
   version: 7.24.1
   resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.1"
   dependencies:
@@ -1265,17 +1265,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-assign@npm:^7.16.7":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-object-assign@npm:7.24.1"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/50d4eba8146521eea8ac6dedbab665ca35d7b00e8db875a04162ef0767be219b382f24266ba293fd44856bb3e9efa3e2b1c6ce1a8827856616736d0d7603847a
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-object-rest-spread@npm:^7.24.1":
   version: 7.24.1
   resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.1"
@@ -1314,7 +1303,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-chaining@npm:^7.24.1":
+"@babel/plugin-transform-optional-chaining@npm:^7.0.0-0, @babel/plugin-transform-optional-chaining@npm:^7.24.1":
   version: 7.24.1
   resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.1"
   dependencies:
@@ -1485,7 +1474,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-shorthand-properties@npm:^7.0.0, @babel/plugin-transform-shorthand-properties@npm:^7.24.1":
+"@babel/plugin-transform-shorthand-properties@npm:^7.0.0, @babel/plugin-transform-shorthand-properties@npm:^7.0.0-0, @babel/plugin-transform-shorthand-properties@npm:^7.24.1":
   version: 7.24.1
   resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.1"
   dependencies:
@@ -1519,7 +1508,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-template-literals@npm:^7.0.0, @babel/plugin-transform-template-literals@npm:^7.24.1":
+"@babel/plugin-transform-template-literals@npm:^7.0.0, @babel/plugin-transform-template-literals@npm:^7.0.0-0, @babel/plugin-transform-template-literals@npm:^7.24.1":
   version: 7.24.1
   resolution: "@babel/plugin-transform-template-literals@npm:7.24.1"
   dependencies: