Merge pull request #720 from enatega/resturantExpoUpd

Expo upgrade version of the restaurant app and rider app to expo 52
enatega · Dec 19, 2024 · c8928ba · c8928ba
2 parents 33e50ca + d9e418d
commit c8928ba
Show file tree

Hide file tree

Showing 15 changed files with 17,456 additions and 20,272 deletions.
diff --git a/enatega-multivendor-restaurant/app.json b/enatega-multivendor-restaurant/app.json
@@ -56,6 +56,7 @@
       "expo-localization",
       "expo-secure-store",
       "sentry-expo"
-    ]
+    ],
+    "newArchEnabled": true
   }
 }
diff --git a/enatega-multivendor-restaurant/environment.js b/enatega-multivendor-restaurant/environment.js
@@ -20,8 +20,8 @@ const getEnvVars = (env = Updates.releaseChannel) => {
     }
   }
   return {
-      // GRAPHQL_URL: 'http://192.168.0.109:8001/graphql',
-      // WS_GRAPHQL_URL: 'ws://192.168.0.109:8001/graphql',
+      // GRAPHQL_URL: 'http://10.97.4.197:8001/graphql',
+      // WS_GRAPHQL_URL: 'ws://10.97.4.197:8001/graphql',
        GRAPHQL_URL: 'https://enatega-multivendor.up.railway.app/graphql',
        WS_GRAPHQL_URL: 'wss://enatega-multivendor.up.railway.app/graphql',
     SENTRY_DSN: configuration.restaurantAppSentryUrl

diff --git a/enatega-multivendor-restaurant/package-lock.json b/enatega-multivendor-restaurant/package-lock.json
diff --git a/enatega-multivendor-restaurant/package.json b/enatega-multivendor-restaurant/package.json
@@ -34,56 +34,56 @@
   },
   "dependencies": {
     "@apollo/client": "^3.5.8",
-    "@expo/config-plugins": "~8.0.0",
+    "@expo/config-plugins": "~9.0.0",
     "@react-native-async-storage/async-storage": "1.23.1",
     "@react-native-community/masked-view": "0.1.11",
     "@react-navigation/bottom-tabs": "^6.2.0",
     "@react-navigation/drawer": "^6.3.1",
     "@react-navigation/material-top-tabs": "^5.3.19",
     "@react-navigation/native": "^6.0.8",
     "@react-navigation/native-stack": "^6.5.0",
-    "@sentry/react-native": "~5.22.0",
+    "@sentry/react-native": "~6.3.0",
     "@use-expo/font": "^2.0.0",
-    "expo": "~51.0.19",
-    "expo-av": "~14.0.6",
-    "expo-constants": "~16.0.2",
-    "expo-device": "~6.0.2",
-    "expo-localization": "~15.0.3",
-    "expo-notifications": "~0.28.9",
-    "expo-print": "~13.0.1",
-    "expo-secure-store": "~13.0.2",
-    "expo-status-bar": "~1.12.1",
-    "expo-updates": "~0.25.18",
+    "expo": "^52.0.0",
+    "expo-av": "~15.0.1",
+    "expo-constants": "~17.0.3",
+    "expo-device": "~7.0.1",
+    "expo-localization": "~16.0.0",
+    "expo-notifications": "~0.29.11",
+    "expo-print": "~14.0.2",
+    "expo-secure-store": "~14.0.0",
+    "expo-status-bar": "~2.0.0",
+    "expo-updates": "~0.26.10",
     "graphql": "^15.6.1",
     "i18n": "^0.14.1",
     "i18next": "^23.7.6",
-    "lottie-react-native": "6.7.0",
+    "lottie-react-native": "7.1.0",
     "moment": "^2.29.1",
     "patch-package": "^6.2.2",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-i18next": "^13.5.0",
-    "react-native": "0.74.3",
+    "react-native": "0.76.5",
     "react-native-countdown-component": "^2.7.1",
     "react-native-elements": "^3.4.2",
     "react-native-flash-message": "^0.1.21",
-    "react-native-gesture-handler": "~2.16.1",
+    "react-native-gesture-handler": "~2.20.2",
     "react-native-keyboard-aware-scroll-view": "^0.9.5",
     "react-native-material-textfield": "^0.16.1",
-    "react-native-reanimated": "~3.10.1",
-    "react-native-safe-area-context": "4.10.1",
-    "react-native-screens": "3.31.1",
+    "react-native-reanimated": "~3.16.1",
+    "react-native-safe-area-context": "4.12.0",
+    "react-native-screens": "~4.1.0",
     "react-native-swipe-gestures": "^1.0.5",
     "react-native-tab-view": "^2.16.0",
-    "react-native-web": "~0.19.6",
+    "react-native-web": "~0.19.13",
     "sentry-expo": "~7.0.0",
     "subscriptions-transport-ws": "^0.9.16",
     "validate.js": "^0.13.1"
   },
   "devDependencies": {
     "@babel/core": "^7.24.0",
-    "@expo/metro-config": "~0.18.1",
-    "babel-preset-expo": "~11.0.0",
+    "@expo/metro-config": "~0.19.0",
+    "babel-preset-expo": "~12.0.0",
     "eslint": "^7.1.0",
     "eslint-config-standard": "^14.1.1",
     "eslint-plugin-import": "^2.20.2",

diff --git a/enatega-multivendor-restaurant/src/components/BackButton/styles.js b/enatega-multivendor-restaurant/src/components/BackButton/styles.js
@@ -1,7 +1,7 @@
-import { StyleSheet, Platform, NativeModules } from 'react-native'
-const { StatusBarManager } = NativeModules
+import { StyleSheet, Platform, StatusBar } from 'react-native'
+// const { StatusBarManager } = NativeModules
 
-const STATUSBAR_HEIGHT = Platform.OS === 'ios' ? 20 : StatusBarManager.HEIGHT
+const STATUSBAR_HEIGHT = Platform.OS === 'ios' ? 20 : StatusBar.currentHeight
 const styles = StyleSheet.create({
   container: {
     position: 'absolute',

diff --git a/enatega-multivendor-restaurant/src/components/TabBars/styles.js b/enatega-multivendor-restaurant/src/components/TabBars/styles.js
@@ -8,6 +8,7 @@ const styles = StyleSheet.create({
     alignItems: 'center'
   },
   barContainer: {
+    marginTop:-30,
     display: 'flex',
     flexDirection: 'row',
     width: '90%',
@@ -22,10 +23,8 @@ const styles = StyleSheet.create({
       height: 2
     },
     shadowOpacity: 0.25,
-    shadowRadius: 3.84,
-
-    elevation: 5,
-    marginTop: -30
+    shadowRadius: 3.84, 
+    elevation: 30,
   },
   barContent: {
     padding: 15,

diff --git a/enatega-multivendor-restaurant/src/screens/Orders/Orders.js b/enatega-multivendor-restaurant/src/screens/Orders/Orders.js
@@ -28,12 +28,12 @@ const Orders = props => {
   const {t} = useTranslation()
   if (error) return <TextError text={error.message} />
   return (
-    <>
+    <View style={{ flex: 1 }}>
       {mutateLoading ? (
         <Spinner />
       ) : (
-        <>
-          <View style={styles.topContainer}>
+        <View style={{ flex: 1,zIndex:10}}>
+          <View style={[styles.topContainer,{ zIndex:-10 }]}>
             <Image
               source={require('../../assets/orders.png')}
               PlaceholderContent={<ActivityIndicator />}
@@ -49,7 +49,7 @@ const Orders = props => {
                     ? colors.green
                     : active === 1
                     ? colors.white
-                    : colors.white
+                    : colors.white,
               }
             ]}>
             <TabBars
@@ -188,9 +188,9 @@ const Orders = props => {
               </ScrollView>
             )}
           </View>
-        </>
+        </View>
       )}
-    </>
+    </View>
   )
 }
 

diff --git a/enatega-multivendor-restaurant/src/screens/Orders/styles.js b/enatega-multivendor-restaurant/src/screens/Orders/styles.js
@@ -5,11 +5,14 @@ const { height } = Dimensions.get('window')
 const Styles = {
   topContainer: {
     backgroundColor: colors.white,
+    // backgroundColor: 'black',
     flex: 0.3,
     justifyContent: 'center',
-    alignItems: 'center'
+    alignItems: 'center',
+
   },
   lowerContainer: {
+    position:'relative',
     backgroundColor: colors.white,
     shadowColor: colors.fontSecondColor,
     shadowOffset: {
@@ -21,7 +24,8 @@ const Styles = {
     elevation: 24,
     flex: 0.7,
     borderTopRightRadius: 30,
-    borderTopLeftRadius: 30
+    borderTopLeftRadius: 30,
+    marginTop: -1,
   },
   scrollView: {
     backgroundColor: 'transparent',

diff --git a/enatega-multivendor-rider/.DS_Store b/enatega-multivendor-rider/.DS_Store
diff --git a/enatega-multivendor-rider/.expo/settings.json b/enatega-multivendor-rider/.expo/settings.json
@@ -4,7 +4,5 @@
   "dev": true,
   "minify": false,
   "urlRandomness": "ji-w5v",
-  "https": false,
-  "scheme": "exp+food-delivery-rider-multivendor",
-  "devClient": false
+  "https": false
 }
diff --git a/enatega-multivendor-rider/app.json b/enatega-multivendor-rider/app.json
@@ -72,7 +72,8 @@
     },
     "updates": {
       "url": "https://u.expo.dev/9144a7fc-b205-464a-8fb6-64eb66fc8743"
-    }
+    },
+    "newArchEnabled": true
   },
   "hooks": {
     "postPublish": [

diff --git a/enatega-multivendor-rider/environment.js b/enatega-multivendor-rider/environment.js
@@ -16,8 +16,8 @@ const getEnvVars = (env = Updates.releaseChannel) => {
     }
   }
   return {
-    // GRAPHQL_URL: 'http://192.168.0.109:8001/graphql',
-    //   WS_GRAPHQL_URL: 'ws://192.168.0.109:8001/graphql',
+      // GRAPHQL_URL: 'http://10.97.4.197:8001/graphql',
+      // WS_GRAPHQL_URL: 'ws://10.97.4.197:8001/graphql',
     GRAPHQL_URL: 'https://enatega-multivendor.up.railway.app/graphql',
     WS_GRAPHQL_URL: 'wss://enatega-multivendor.up.railway.app/graphql',
     SENTRY_DSN: configuration.riderAppSentryUrl,