Merge remote-tracking branch 'origin/feature/IO-2222-SDK-upgrades' into release/1.6.0

app.json

@@ -32,7 +32,7 @@
       ]
     },
     "splash": {
-      "image": "./assets/Splash.png",
+      "image": "./assets/splash.png",
       "backgroundColor": "#efefef"
     },
     "notification": {
@@ -41,7 +41,9 @@
     "updates": {
       "fallbackToCacheTimeout": 0
     },
-    "assetBundlePatterns": ["**/*"],
+    "assetBundlePatterns": [
+      "**/*"
+    ],
     "web": {
       "favicon": "./assets/logo192noa.png",
       "config": {
@@ -79,7 +81,8 @@
           "savePhotosPermission": "Allow $(PRODUCT_NAME) to save photos.",
           "isAccessMediaLocationEnabled": "true"
         }
-      ]
+      ],
+      "expo-localization"
     ]
   }
 }

firebase/firebase.analytics.js

@@ -1,4 +1,4 @@
-import * as Analytics from "expo-firebase-analytics";
+// import * as Analytics from "expo-firebase-analytics";//JF:commenting out the firebase analytics portion
 //import { store } from "../redux/store";
 
 export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
@@ -12,7 +12,7 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
     //   null,
     ...additionalParams,
   };
-  Analytics.logEvent(eventName, eventParams);
+  // Analytics.logEvent(eventName, eventParams);//JF:commenting out the firebase analytics portion
 };
 
 //export const ExpoAnalytics = Analytics;

package.json

@@ -17,10 +17,12 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.0-alpha.3",
+    "@babel/preset-env": "7.1.6",
     "@expo/vector-icons": "^13.0.0",
-    "@react-native-async-storage/async-storage": "~1.17.10",
+    "@react-native-async-storage/async-storage": "1.18.2",
     "@react-native-community/art": "^1.2.0",
     "@react-native-community/cli-debugger-ui": "^9.0.0",
+    "@react-native-community/datetimepicker": "7.2.0",
     "@react-native-community/masked-view": "^0.1.11",
     "@react-navigation/bottom-tabs": "^6.3.3",
     "@react-navigation/drawer": "^6.4.4",
@@ -30,26 +32,23 @@
     "axios": "^0.27.2",
     "cloudinary-core": "^2.13.0",
     "dinero.js": "^1.9.1",
-    "expo": "^46.0.10",
-    "expo-app-loading": "~2.1.0",
-    "expo-application": "~4.2.2",
-    "expo-av": "~12.0.4",
-    "expo-camera": "~12.3.0",
-    "expo-constants": "~13.2.4",
-    "expo-dev-client": "~1.2.1",
-    "expo-device": "~4.3.0",
-    "expo-file-system": "~14.1.0",
-    "expo-firebase-analytics": "~7.1.1",
-    "expo-font": "~10.2.0",
-    "expo-image-manipulator": "~10.4.0",
+    "expo": "^49.0.0",
+    "expo-application": "~5.3.0",
+    "expo-av": "~13.4.1",
+    "expo-constants": "~14.4.2",
+    "expo-dev-client": "~2.4.6",
+    "expo-device": "~5.4.0",
+    "expo-file-system": "~15.4.2",
+    "expo-font": "~11.4.0",
+    "expo-image-manipulator": "~11.3.0",
     "expo-images-picker": "^2.4.1",
-    "expo-localization": "~13.1.0",
-    "expo-media-library": "~14.2.0",
-    "expo-permissions": "~13.2.0",
-    "expo-status-bar": "~1.4.0",
-    "expo-system-ui": "~1.3.0",
-    "expo-updates": "~0.14.5",
-    "expo-video-thumbnails": "~6.4.0",
+    "expo-localization": "~14.3.0",
+    "expo-media-library": "~15.4.1",
+    "expo-permissions": "~14.2.1",
+    "expo-status-bar": "~1.6.0",
+    "expo-system-ui": "~2.4.0",
+    "expo-updates": "~0.18.11",
+    "expo-video-thumbnails": "~7.4.0",
     "firebase": "^9.8.3",
     "formik": "^2.2.9",
     "graphql": "^16.6.0",
@@ -60,37 +59,41 @@
     "mime": "^3.0.0",
     "moment": "^2.29.4",
     "normalize-url": "^7.0.3",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "react-i18next": "^11.17.2",
-    "react-native": "0.69.5",
-    "react-native-dnd-board": "hungga1711/react-native-dnd-board#13/head",
+    "react-is": ">= 16.8.0",
+    "react-native": "0.72.3",
     "react-native-draggable-flatlist": "^3.1.2",
-    "react-native-gesture-handler": "~2.5.0",
+    "react-native-element-dropdown": "^2.9.0",
+    "react-native-gesture-handler": "~2.12.0",
     "react-native-image-gallery": "^2.1.5",
     "react-native-image-viewing": "^0.2.2",
     "react-native-indicators": "^0.17.0",
-    "react-native-pager-view": "5.4.24",
+    "react-native-modal-datetime-picker": "^15.0.0",
+    "react-native-pager-view": "6.2.0",
     "react-native-paper": "^4.12.4",
     "react-native-progress": "^5.0.0",
-    "react-native-reanimated": "~2.9.1",
-    "react-native-safe-area-context": "4.3.1",
-    "react-native-screens": "~3.15.0",
+    "react-native-reanimated": "~3.3.0",
+    "react-native-safe-area-context": "4.6.3",
+    "react-native-screens": "~3.22.0",
+    "react-native-svg": "13.9.0",
     "react-native-tab-view": "3.1.1",
     "react-native-toast-message": "^2.1.5",
-    "react-native-web": "~0.18.7",
+    "react-native-vector-icons": "*",
+    "react-native-web": "~0.19.6",
     "react-redux": "^7.2.6",
     "redux": "^4.1.2",
     "redux-logger": "^3.0.6",
     "redux-persist": "^6.0.0",
     "redux-saga": "^1.1.3",
     "reselect": "^4.1.6",
-    "sentry-expo": "~5.0.0",
+    "sentry-expo": "~7.0.0",
     "subscriptions-transport-ws": "^0.9.18"
   },
   "devDependencies": {
-    "@babel/core": "^7.19.0",
-    "babel-preset-expo": "~9.2.0",
+    "@babel/core": "^7.19.3",
+    "babel-preset-expo": "^9.5.0",
     "eslint": "^7.27.0",
     "eslint-plugin-react": "^7.24.0",
     "eslint-plugin-react-native": "^3.11.0"

redux/user/user.sagas.js

@@ -1,4 +1,4 @@
-import * as Analytics from "expo-firebase-analytics";
+//import * as Analytics from "expo-firebase-analytics";//JF:commenting out the firebase analytics portion
 import { signInWithEmailAndPassword, signOut } from "firebase/auth";
 import { all, call, put, takeLatest } from "redux-saga/effects";
 import * as Sentry from "sentry-expo";
@@ -107,7 +107,7 @@ export function* onSignInSuccess() {
 
 export function* signInSuccessSaga({ payload }) {
   try {
-    Analytics.setUserId(payload.email);
+    // Analytics.setUserId(payload.email);//JF:commenting out the firebase analytics portion
     Sentry.Native.setUser({ email: payload.email });
 
     const shop = yield client.query({ query: QUERY_BODYSHOP });