update navigation libriries

Author: dimaportenko

.prettierrc.js

@@ -3,4 +3,5 @@ module.exports = {
   jsxBracketSameLine: true,
   singleQuote: true,
   trailingComma: 'all',
+  arrowParens: 'avoid',
 };

ios/Podfile

@@ -9,7 +9,7 @@ target 'magento_mobile_app' do
   use_react_native!(
     :path => config[:reactNativePath],
     # to enable hermes on iOS, change `false` to `true` and then install pods
-    :hermes_enabled => false
+    :hermes_enabled => true
   )
 
   # Enables Flipper.

ios/Podfile.lock

@@ -62,6 +62,7 @@ PODS:
     - FlipperKit/Core
     - FlipperKit/FlipperKitNetworkPlugin
   - glog (0.3.5)
+  - hermes-engine (0.7.2)
   - libevent (2.1.12)
   - libwebp (1.2.0):
     - libwebp/demux (= 1.2.0)
@@ -82,6 +83,11 @@ PODS:
     - boost-for-react-native
     - DoubleConversion
     - glog
+  - RCT-Folly/Futures (2020.01.13.00):
+    - boost-for-react-native
+    - DoubleConversion
+    - glog
+    - libevent
   - RCTRequired (0.64.2)
   - RCTTypeSafety (0.64.2):
     - FBLazyVector (= 0.64.2)
@@ -139,6 +145,16 @@ PODS:
     - React-jsinspector (= 0.64.2)
     - React-perflogger (= 0.64.2)
     - Yoga
+  - React-Core/Hermes (0.64.2):
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly/Futures
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
+    - Yoga
   - React-Core/RCTActionSheetHeaders (0.64.2):
     - glog
     - RCT-Folly (= 2020.01.13.00)
@@ -266,6 +282,8 @@ PODS:
     - React-jsi (= 0.64.2)
     - React-perflogger (= 0.64.2)
   - React-jsinspector (0.64.2)
+  - react-native-safe-area-context (3.2.0):
+    - React-Core
   - react-native-webview (11.0.0):
     - React-Core
   - React-perflogger (0.64.2)
@@ -383,19 +401,23 @@ DEPENDENCIES:
   - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.75.1)
   - FlipperKit/SKIOSNetworkPlugin (~> 0.75.1)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
+  - hermes-engine (~> 0.7.2)
+  - libevent (~> 2.1.12)
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
   - React (from `../node_modules/react-native/`)
   - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
   - React-Core (from `../node_modules/react-native/`)
   - React-Core/DevSupport (from `../node_modules/react-native/`)
+  - React-Core/Hermes (from `../node_modules/react-native/`)
   - React-Core/RCTWebSocket (from `../node_modules/react-native/`)
   - React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
   - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
   - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
+  - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - react-native-webview (from `../node_modules/react-native-webview`)
   - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
@@ -429,6 +451,7 @@ SPEC REPOS:
     - Flipper-PeerTalk
     - Flipper-RSocket
     - FlipperKit
+    - hermes-engine
     - libevent
     - libwebp
     - OpenSSL-Universal
@@ -469,6 +492,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/jsiexecutor"
   React-jsinspector:
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
+  react-native-safe-area-context:
+    :path: "../node_modules/react-native-safe-area-context"
   react-native-webview:
     :path: "../node_modules/react-native-webview"
   React-perflogger:
@@ -527,6 +552,7 @@ SPEC CHECKSUMS:
   Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154
   FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00
   glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
+  hermes-engine: 7d97ba46a1e29bacf3e3c61ecb2804a5ddd02d4f
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   libwebp: e90b9c01d99205d03b6bb8f2c8c415e5a4ef66f0
   OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
@@ -541,6 +567,7 @@ SPEC CHECKSUMS:
   React-jsi: 67747b9722f6dab2ffe15b011bcf6b3f2c3f1427
   React-jsiexecutor: 80c46bd381fd06e418e0d4f53672dc1d1945c4c3
   React-jsinspector: cc614ec18a9ca96fd275100c16d74d62ee11f0ae
+  react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
   react-native-webview: 6b7950628616679d81bdd75747e50cf6de9b5a5f
   React-perflogger: 25373e382fed75ce768a443822f07098a15ab737
   React-RCTActionSheet: af7796ba49ffe4ca92e7277a5d992d37203f7da5
@@ -566,6 +593,6 @@ SPEC CHECKSUMS:
   Yoga: 575c581c63e0d35c9a83f4b46d01d63abc1100ac
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 165bd189de915a836bc5baffb3a8c76f7ba50da0
+PODFILE CHECKSUM: 820ce3ecc087b824d7ebe806ca031faf14bcbdc1
 
 COCOAPODS: 1.10.1

ios/magento_mobile_app.xcodeproj/project.pbxproj

@@ -374,10 +374,12 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-magento_mobile_app/Pods-magento_mobile_app-frameworks.sh",
+				"${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/iphoneos/hermes.framework",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -484,7 +486,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -529,7 +531,7 @@
 				ENABLE_BITCODE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

package.json

@@ -27,16 +27,17 @@
     "react-native-modal-selector": "^2.0.2",
     "react-native-reanimated": "^1.7.0",
     "react-native-render-html": "^4.2.3",
+    "react-native-safe-area-context": "^3.2.0",
     "react-native-screens": "^2.0.0-alpha.28",
     "react-native-simple-radio-button": "^2.7.4",
     "react-native-swiper": "^1.6.0-rc.3",
     "react-native-vector-icons": "6.6.0",
     "react-native-webview": "^11.0.0",
-    "react-navigation": "^4.0.10",
-    "react-navigation-drawer": "^2.2.2",
-    "react-navigation-header-buttons": "^3.0.3",
-    "react-navigation-stack": "^1.9.4",
-    "react-navigation-tabs": "^2.5.6",
+    "react-navigation": "^4.4.4",
+    "react-navigation-drawer": "^2.7.1",
+    "react-navigation-header-buttons": "^3.0.5",
+    "react-navigation-stack": "^2.10.4",
+    "react-navigation-tabs": "^2.11.1",
     "react-redux": "^7.1.1",
     "redux": "^4.0.4",
     "redux-persist": "^6.0.0",

patches/react-native+0.62.2.patch

@@ -8,19 +8,25 @@ import NavigationService from './navigation/NavigationService';
 import { onAppStart } from './helper/app';
 
 import { Spinner } from './components/common';
+import { SafeAreaProvider } from 'react-native-safe-area-context';
+import { SafeAreaView } from 'react-navigation';
 
 onAppStart(store);
 
 const App = () => (
   <Provider store={store}>
     <ThemeProvider theme={theme}>
-      <PersistGate loading={<Spinner />} persistor={persistor}>
-        <Navigator
-          ref={(navigatorRef) => {
-            NavigationService.setTopLevelNavigator(navigatorRef);
-          }}
-        />
-      </PersistGate>
+      <SafeAreaProvider>
+        <SafeAreaView style={{ flex: 1 }} forceInset={{ bottom: 'never' }}>
+          <PersistGate loading={<Spinner />} persistor={persistor}>
+            <Navigator
+              ref={navigatorRef => {
+                NavigationService.setTopLevelNavigator(navigatorRef);
+              }}
+            />
+          </PersistGate>
+        </SafeAreaView>
+      </SafeAreaProvider>
     </ThemeProvider>
   </Provider>
 );

src/App.js

@@ -3,8 +3,7 @@ import { magento } from '../magento';
 import { logError } from '../helper/logger';
 import { createCustomerCart } from './RestActions';
 
-
-export const addCouponToCart = (couponCode) => async (dispatch, getState) => {
+export const addCouponToCart = couponCode => async (dispatch, getState) => {
   dispatch({ type: types.MAGENTO_COUPON_LOADING, payload: true });
   try {
     const cartId = getState().cart?.cartId || getState().cart?.quote?.id;
@@ -44,7 +43,10 @@ export const removeCouponFromCart = () => async (dispatch, getState) => {
 };
 
 export const refreshCart = () => async (dispatch, getState) => {
-  dispatch({ type: types.MAGENTO_UPDATE_REFRESHING_CART_ITEM_PRODUCT, payload: true });
+  dispatch({
+    type: types.MAGENTO_UPDATE_REFRESHING_CART_ITEM_PRODUCT,
+    payload: true,
+  });
 
   try {
     let cart;
@@ -55,10 +57,16 @@ export const refreshCart = () => async (dispatch, getState) => {
       cart = await magento.guest.getGuestCart(cartId);
     }
     dispatch({ type: types.MAGENTO_GET_CART, payload: cart });
-    dispatch({ type: types.MAGENTO_UPDATE_REFRESHING_CART_ITEM_PRODUCT, payload: false });
+    dispatch({
+      type: types.MAGENTO_UPDATE_REFRESHING_CART_ITEM_PRODUCT,
+      payload: false,
+    });
   } catch (error) {
     logError(error);
-    if (error.message && error.message.includes('No such entity with customerId')) {
+    if (
+      error.message &&
+      error.message.includes('No such entity with customerId')
+    ) {
       const { customer } = getState().account;
       if (customer && customer.id) {
         dispatch(createCustomerCart(customer.id));

src/actions/CartActions.js

@@ -22,7 +22,7 @@ import {
 } from '../navigation/routes';
 import { logError } from '../helper/logger';
 
-export const signIn = customer => async (dispatch) => {
+export const signIn = customer => async dispatch => {
   try {
     dispatch({ type: MAGENTO_CREATE_CUSTOMER_LOADING, payload: true });
     const response = await magento.guest.createCustomer(customer);
@@ -48,7 +48,7 @@ export const signIn = customer => async (dispatch) => {
   }
 };
 
-export const auth = (username, password) => async (dispatch) => {
+export const auth = (username, password) => async dispatch => {
   try {
     dispatch({ type: MAGENTO_AUTH_LOADING, payload: true });
     const response = await magento.guest.auth(username, password);
@@ -85,9 +85,12 @@ const authFail = (dispatch, message) => {
   dispatch({ type: MAGENTO_AUTH_LOADING, payload: false });
 };
 
-export const errorMessage = error => ({ type: MAGENTO_AUTH_ERROR, payload: error });
+export const errorMessage = error => ({
+  type: MAGENTO_AUTH_ERROR,
+  payload: error,
+});
 
-export const logout = () => (dispatch) => {
+export const logout = () => dispatch => {
   dispatch({ type: MAGENTO_AUTH, payload: '' });
   dispatch({ type: MAGENTO_LOGOUT });
   dispatch(getCart());
@@ -96,7 +99,7 @@ export const logout = () => (dispatch) => {
   magento.setCustomerToken(false);
 };
 
-export const initiatePasswordReset = email => async (dispatch) => {
+export const initiatePasswordReset = email => async dispatch => {
   try {
     dispatch({ type: MAGENTO_PASSWORD_RESET_LOADING, payload: true });
     await magento.guest.initiatePasswordReset(email);
@@ -105,19 +108,22 @@ export const initiatePasswordReset = email => async (dispatch) => {
     dispatch({ type: MAGENTO_PASSWORD_RESET_SUCCESS, payload: message });
   } catch (e) {
     logError(e);
-    dispatch({ type: MAGENTO_PASSWORD_RESET_ERROR, payload: { errorMessage: e.message } });
+    dispatch({
+      type: MAGENTO_PASSWORD_RESET_ERROR,
+      payload: { errorMessage: e.message },
+    });
   }
 };
 
 /**
  * This action will reset all the state varaibales related to
  * password_reset in the CustomerAuthReducer.
  */
-export const updatePasswordResetUI = () => async (dispatch) => {
+export const updatePasswordResetUI = () => async dispatch => {
   dispatch({ type: MAGENTO_PASSWORD_RESET_LOADING, payload: false });
 };
 
-export const currentCustomer = () => async (dispatch) => {
+export const currentCustomer = () => async dispatch => {
   try {
     const customer = await magento.customer.getCurrentCustomer();
     dispatch({

src/actions/CustomerAuthActions.js

@@ -10,7 +10,7 @@ import {
 /**
  * Get product from a category
  */
-export const getRelatedProduct = (categoryIds, sku) => async (dispatch) => {
+export const getRelatedProduct = (categoryIds, sku) => async dispatch => {
   try {
     dispatch({ type: MAGENTO_RELATED_PRODUCTS_LOADING, payload: true });
     const result = await magento.admin.getProductsWithAttribute(
@@ -29,9 +29,15 @@ export const getRelatedProduct = (categoryIds, sku) => async (dispatch) => {
       MAGENTO_RELATED_PRODUCTS_CONF_PRODUCT,
     );
     if (result && result.items) {
-      dispatch({ type: MAGENTO_RELATED_PRODUCTS_SUCCESS, payload: result.items });
+      dispatch({
+        type: MAGENTO_RELATED_PRODUCTS_SUCCESS,
+        payload: result.items,
+      });
     }
   } catch (error) {
-    dispatch({ type: MAGENTO_RELATED_PRODUCTS_ERROR, payload: { errorMessage: error.message } });
+    dispatch({
+      type: MAGENTO_RELATED_PRODUCTS_ERROR,
+      payload: { errorMessage: error.message },
+    });
   }
 };