diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index 953179f1e1f8..66c206b31b06 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -791,6 +791,7 @@ ); MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; + REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; }; name = Debug; @@ -844,6 +845,7 @@ "\"$(inherited)\"", ); MTL_ENABLE_DEBUG_INFO = NO; + REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e8c0a53362e1..fb66c43c9deb 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -17,14 +17,14 @@ PODS: - boost (1.76.0) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.70.4-alpha.1) - - FBReactNativeSpec (0.70.4-alpha.1): + - FBLazyVector (0.70.4-alpha.2) + - FBReactNativeSpec (0.70.4-alpha.2): - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.70.4-alpha.1) - - RCTTypeSafety (= 0.70.4-alpha.1) - - React-Core (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - ReactCommon/turbomodule/core (= 0.70.4-alpha.1) + - RCTRequired (= 0.70.4-alpha.2) + - RCTTypeSafety (= 0.70.4-alpha.2) + - React-Core (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - ReactCommon/turbomodule/core (= 0.70.4-alpha.2) - Firebase/Analytics (8.8.0): - Firebase/Core - Firebase/Core (8.8.0): @@ -249,214 +249,214 @@ PODS: - fmt (~> 6.2.1) - glog - libevent - - RCTRequired (0.70.4-alpha.1) - - RCTTypeSafety (0.70.4-alpha.1): - - FBLazyVector (= 0.70.4-alpha.1) - - RCTRequired (= 0.70.4-alpha.1) - - React-Core (= 0.70.4-alpha.1) - - React (0.70.4-alpha.1): - - React-Core (= 0.70.4-alpha.1) - - React-Core/DevSupport (= 0.70.4-alpha.1) - - React-Core/RCTWebSocket (= 0.70.4-alpha.1) - - React-RCTActionSheet (= 0.70.4-alpha.1) - - React-RCTAnimation (= 0.70.4-alpha.1) - - React-RCTBlob (= 0.70.4-alpha.1) - - React-RCTImage (= 0.70.4-alpha.1) - - React-RCTLinking (= 0.70.4-alpha.1) - - React-RCTNetwork (= 0.70.4-alpha.1) - - React-RCTSettings (= 0.70.4-alpha.1) - - React-RCTText (= 0.70.4-alpha.1) - - React-RCTVibration (= 0.70.4-alpha.1) - - React-bridging (0.70.4-alpha.1): + - RCTRequired (0.70.4-alpha.2) + - RCTTypeSafety (0.70.4-alpha.2): + - FBLazyVector (= 0.70.4-alpha.2) + - RCTRequired (= 0.70.4-alpha.2) + - React-Core (= 0.70.4-alpha.2) + - React (0.70.4-alpha.2): + - React-Core (= 0.70.4-alpha.2) + - React-Core/DevSupport (= 0.70.4-alpha.2) + - React-Core/RCTWebSocket (= 0.70.4-alpha.2) + - React-RCTActionSheet (= 0.70.4-alpha.2) + - React-RCTAnimation (= 0.70.4-alpha.2) + - React-RCTBlob (= 0.70.4-alpha.2) + - React-RCTImage (= 0.70.4-alpha.2) + - React-RCTLinking (= 0.70.4-alpha.2) + - React-RCTNetwork (= 0.70.4-alpha.2) + - React-RCTSettings (= 0.70.4-alpha.2) + - React-RCTText (= 0.70.4-alpha.2) + - React-RCTVibration (= 0.70.4-alpha.2) + - React-bridging (0.70.4-alpha.2): - RCT-Folly (= 2021.07.22.00) - - React-jsi (= 0.70.4-alpha.1) - - React-callinvoker (0.70.4-alpha.1) - - React-Codegen (0.70.4-alpha.1): - - FBReactNativeSpec (= 0.70.4-alpha.1) + - React-jsi (= 0.70.4-alpha.2) + - React-callinvoker (0.70.4-alpha.2) + - React-Codegen (0.70.4-alpha.2): + - FBReactNativeSpec (= 0.70.4-alpha.2) - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.70.4-alpha.1) - - RCTTypeSafety (= 0.70.4-alpha.1) - - React-Core (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsiexecutor (= 0.70.4-alpha.1) - - ReactCommon/turbomodule/core (= 0.70.4-alpha.1) - - React-Core (0.70.4-alpha.1): + - RCTRequired (= 0.70.4-alpha.2) + - RCTTypeSafety (= 0.70.4-alpha.2) + - React-Core (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsiexecutor (= 0.70.4-alpha.2) + - ReactCommon/turbomodule/core (= 0.70.4-alpha.2) + - React-Core (0.70.4-alpha.2): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.4-alpha.1) - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsiexecutor (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) + - React-Core/Default (= 0.70.4-alpha.2) + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsiexecutor (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) - Yoga - - React-Core/CoreModulesHeaders (0.70.4-alpha.1): + - React-Core/CoreModulesHeaders (0.70.4-alpha.2): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsiexecutor (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsiexecutor (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) - Yoga - - React-Core/Default (0.70.4-alpha.1): + - React-Core/Default (0.70.4-alpha.2): - glog - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsiexecutor (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsiexecutor (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) - Yoga - - React-Core/DevSupport (0.70.4-alpha.1): + - React-Core/DevSupport (0.70.4-alpha.2): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.4-alpha.1) - - React-Core/RCTWebSocket (= 0.70.4-alpha.1) - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsiexecutor (= 0.70.4-alpha.1) - - React-jsinspector (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) + - React-Core/Default (= 0.70.4-alpha.2) + - React-Core/RCTWebSocket (= 0.70.4-alpha.2) + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsiexecutor (= 0.70.4-alpha.2) + - React-jsinspector (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) - Yoga - - React-Core/RCTActionSheetHeaders (0.70.4-alpha.1): + - React-Core/RCTActionSheetHeaders (0.70.4-alpha.2): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsiexecutor (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsiexecutor (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) - Yoga - - React-Core/RCTAnimationHeaders (0.70.4-alpha.1): + - React-Core/RCTAnimationHeaders (0.70.4-alpha.2): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsiexecutor (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsiexecutor (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) - Yoga - - React-Core/RCTBlobHeaders (0.70.4-alpha.1): + - React-Core/RCTBlobHeaders (0.70.4-alpha.2): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsiexecutor (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsiexecutor (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) - Yoga - - React-Core/RCTImageHeaders (0.70.4-alpha.1): + - React-Core/RCTImageHeaders (0.70.4-alpha.2): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsiexecutor (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsiexecutor (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) - Yoga - - React-Core/RCTLinkingHeaders (0.70.4-alpha.1): + - React-Core/RCTLinkingHeaders (0.70.4-alpha.2): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsiexecutor (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsiexecutor (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) - Yoga - - React-Core/RCTNetworkHeaders (0.70.4-alpha.1): + - React-Core/RCTNetworkHeaders (0.70.4-alpha.2): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsiexecutor (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsiexecutor (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) - Yoga - - React-Core/RCTSettingsHeaders (0.70.4-alpha.1): + - React-Core/RCTSettingsHeaders (0.70.4-alpha.2): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsiexecutor (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsiexecutor (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) - Yoga - - React-Core/RCTTextHeaders (0.70.4-alpha.1): + - React-Core/RCTTextHeaders (0.70.4-alpha.2): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsiexecutor (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsiexecutor (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) - Yoga - - React-Core/RCTVibrationHeaders (0.70.4-alpha.1): + - React-Core/RCTVibrationHeaders (0.70.4-alpha.2): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsiexecutor (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsiexecutor (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) - Yoga - - React-Core/RCTWebSocket (0.70.4-alpha.1): + - React-Core/RCTWebSocket (0.70.4-alpha.2): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.4-alpha.1) - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsiexecutor (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) + - React-Core/Default (= 0.70.4-alpha.2) + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsiexecutor (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) - Yoga - - React-CoreModules (0.70.4-alpha.1): + - React-CoreModules (0.70.4-alpha.2): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.4-alpha.1) - - React-Codegen (= 0.70.4-alpha.1) - - React-Core/CoreModulesHeaders (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-RCTImage (= 0.70.4-alpha.1) - - ReactCommon/turbomodule/core (= 0.70.4-alpha.1) - - React-cxxreact (0.70.4-alpha.1): + - RCTTypeSafety (= 0.70.4-alpha.2) + - React-Codegen (= 0.70.4-alpha.2) + - React-Core/CoreModulesHeaders (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-RCTImage (= 0.70.4-alpha.2) + - ReactCommon/turbomodule/core (= 0.70.4-alpha.2) + - React-cxxreact (0.70.4-alpha.2): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsinspector (= 0.70.4-alpha.1) - - React-logger (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) - - React-runtimeexecutor (= 0.70.4-alpha.1) - - React-hermes (0.70.4-alpha.1): + - React-callinvoker (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsinspector (= 0.70.4-alpha.2) + - React-logger (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) + - React-runtimeexecutor (= 0.70.4-alpha.2) + - React-hermes (0.70.4-alpha.2): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - RCT-Folly/Futures (= 2021.07.22.00) - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-jsiexecutor (= 0.70.4-alpha.1) - - React-jsinspector (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) - - React-jsi (0.70.4-alpha.1): + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-jsiexecutor (= 0.70.4-alpha.2) + - React-jsinspector (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) + - React-jsi (0.70.4-alpha.2): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-jsi/Default (= 0.70.4-alpha.1) - - React-jsi/Default (0.70.4-alpha.1): + - React-jsi/Default (= 0.70.4-alpha.2) + - React-jsi/Default (0.70.4-alpha.2): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-jsiexecutor (0.70.4-alpha.1): + - React-jsiexecutor (0.70.4-alpha.2): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) - - React-jsinspector (0.70.4-alpha.1) - - React-logger (0.70.4-alpha.1): + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) + - React-jsinspector (0.70.4-alpha.2) + - React-logger (0.70.4-alpha.2): - glog - react-native-blob-util (0.16.2): - React-Core @@ -472,7 +472,7 @@ PODS: - React-Core - react-native-image-manipulator (1.0.5): - React - - react-native-image-picker (4.8.5): + - react-native-image-picker (4.10.1): - React-Core - react-native-netinfo (8.3.1): - React-Core @@ -495,72 +495,72 @@ PODS: - ReactCommon/turbomodule/core - react-native-webview (11.23.0): - React-Core - - React-perflogger (0.70.4-alpha.1) - - React-RCTActionSheet (0.70.4-alpha.1): - - React-Core/RCTActionSheetHeaders (= 0.70.4-alpha.1) - - React-RCTAnimation (0.70.4-alpha.1): + - React-perflogger (0.70.4-alpha.2) + - React-RCTActionSheet (0.70.4-alpha.2): + - React-Core/RCTActionSheetHeaders (= 0.70.4-alpha.2) + - React-RCTAnimation (0.70.4-alpha.2): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.4-alpha.1) - - React-Codegen (= 0.70.4-alpha.1) - - React-Core/RCTAnimationHeaders (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - ReactCommon/turbomodule/core (= 0.70.4-alpha.1) - - React-RCTBlob (0.70.4-alpha.1): + - RCTTypeSafety (= 0.70.4-alpha.2) + - React-Codegen (= 0.70.4-alpha.2) + - React-Core/RCTAnimationHeaders (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - ReactCommon/turbomodule/core (= 0.70.4-alpha.2) + - React-RCTBlob (0.70.4-alpha.2): - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.70.4-alpha.1) - - React-Core/RCTBlobHeaders (= 0.70.4-alpha.1) - - React-Core/RCTWebSocket (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-RCTNetwork (= 0.70.4-alpha.1) - - ReactCommon/turbomodule/core (= 0.70.4-alpha.1) - - React-RCTImage (0.70.4-alpha.1): + - React-Codegen (= 0.70.4-alpha.2) + - React-Core/RCTBlobHeaders (= 0.70.4-alpha.2) + - React-Core/RCTWebSocket (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-RCTNetwork (= 0.70.4-alpha.2) + - ReactCommon/turbomodule/core (= 0.70.4-alpha.2) + - React-RCTImage (0.70.4-alpha.2): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.4-alpha.1) - - React-Codegen (= 0.70.4-alpha.1) - - React-Core/RCTImageHeaders (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-RCTNetwork (= 0.70.4-alpha.1) - - ReactCommon/turbomodule/core (= 0.70.4-alpha.1) - - React-RCTLinking (0.70.4-alpha.1): - - React-Codegen (= 0.70.4-alpha.1) - - React-Core/RCTLinkingHeaders (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - ReactCommon/turbomodule/core (= 0.70.4-alpha.1) - - React-RCTNetwork (0.70.4-alpha.1): + - RCTTypeSafety (= 0.70.4-alpha.2) + - React-Codegen (= 0.70.4-alpha.2) + - React-Core/RCTImageHeaders (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-RCTNetwork (= 0.70.4-alpha.2) + - ReactCommon/turbomodule/core (= 0.70.4-alpha.2) + - React-RCTLinking (0.70.4-alpha.2): + - React-Codegen (= 0.70.4-alpha.2) + - React-Core/RCTLinkingHeaders (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - ReactCommon/turbomodule/core (= 0.70.4-alpha.2) + - React-RCTNetwork (0.70.4-alpha.2): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.4-alpha.1) - - React-Codegen (= 0.70.4-alpha.1) - - React-Core/RCTNetworkHeaders (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - ReactCommon/turbomodule/core (= 0.70.4-alpha.1) - - React-RCTSettings (0.70.4-alpha.1): + - RCTTypeSafety (= 0.70.4-alpha.2) + - React-Codegen (= 0.70.4-alpha.2) + - React-Core/RCTNetworkHeaders (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - ReactCommon/turbomodule/core (= 0.70.4-alpha.2) + - React-RCTSettings (0.70.4-alpha.2): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.4-alpha.1) - - React-Codegen (= 0.70.4-alpha.1) - - React-Core/RCTSettingsHeaders (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - ReactCommon/turbomodule/core (= 0.70.4-alpha.1) - - React-RCTText (0.70.4-alpha.1): - - React-Core/RCTTextHeaders (= 0.70.4-alpha.1) - - React-RCTVibration (0.70.4-alpha.1): + - RCTTypeSafety (= 0.70.4-alpha.2) + - React-Codegen (= 0.70.4-alpha.2) + - React-Core/RCTSettingsHeaders (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - ReactCommon/turbomodule/core (= 0.70.4-alpha.2) + - React-RCTText (0.70.4-alpha.2): + - React-Core/RCTTextHeaders (= 0.70.4-alpha.2) + - React-RCTVibration (0.70.4-alpha.2): - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.70.4-alpha.1) - - React-Core/RCTVibrationHeaders (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - ReactCommon/turbomodule/core (= 0.70.4-alpha.1) - - React-runtimeexecutor (0.70.4-alpha.1): - - React-jsi (= 0.70.4-alpha.1) - - ReactCommon/turbomodule/core (0.70.4-alpha.1): + - React-Codegen (= 0.70.4-alpha.2) + - React-Core/RCTVibrationHeaders (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - ReactCommon/turbomodule/core (= 0.70.4-alpha.2) + - React-runtimeexecutor (0.70.4-alpha.2): + - React-jsi (= 0.70.4-alpha.2) + - ReactCommon/turbomodule/core (0.70.4-alpha.2): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-bridging (= 0.70.4-alpha.1) - - React-callinvoker (= 0.70.4-alpha.1) - - React-Core (= 0.70.4-alpha.1) - - React-cxxreact (= 0.70.4-alpha.1) - - React-jsi (= 0.70.4-alpha.1) - - React-logger (= 0.70.4-alpha.1) - - React-perflogger (= 0.70.4-alpha.1) + - React-bridging (= 0.70.4-alpha.2) + - React-callinvoker (= 0.70.4-alpha.2) + - React-Core (= 0.70.4-alpha.2) + - React-cxxreact (= 0.70.4-alpha.2) + - React-jsi (= 0.70.4-alpha.2) + - React-logger (= 0.70.4-alpha.2) + - React-perflogger (= 0.70.4-alpha.2) - RNCAsyncStorage (1.17.10): - React-Core - RNCClipboard (1.5.1): @@ -921,8 +921,8 @@ SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: 674d5b03473bdbc879c79c6ad770d17aef384b03 - FBReactNativeSpec: 3d8684f3599fef61928f5226eb41376945a5bc97 + FBLazyVector: 4c04f10d8958a7be74dc063bc0584ff223b89d4a + FBReactNativeSpec: b6ac4163edc4db460a21e2de83c8a9f3acd5c6cc Firebase: 629510f1a9ddb235f3a7c5c8ceb23ba887f0f814 FirebaseABTesting: 10cbce8db9985ae2e3847ea44e9947dd18f94e10 FirebaseAnalytics: 5506ea8b867d8423485a84b4cd612d279f7b0b8a @@ -960,27 +960,27 @@ SPEC CHECKSUMS: Plaid: 6beadc0828cfd5396c5905931b9503493bbc139a PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda - RCTRequired: 9171c759923bb34cebba3142a996ff0055a26558 - RCTTypeSafety: b6e02adf80bbbb3df7ff287959df499dab9d66b0 - React: a75e21ae0e5409626c31321359785e7e3d2fa4ab - React-bridging: 99c78cffc6d53177130c27c309ffd3ca4a008add - React-callinvoker: 470766a4e2f49490da6e25923e9bd7f19a449cda - React-Codegen: 6f97b1b03090f65582ddccb0b75ea1662f34b54b - React-Core: f780c93e3b8248ca22f08149b1f4f94f85ab24c7 - React-CoreModules: 87351a3490e6bbc8bec65cd5c5c2f5a16a18e01f - React-cxxreact: 1eb773153ae7609bd7ee42c708951742d8cac3c8 - React-hermes: 0f83c702505261ab33e1938ca4a6def638a003e2 - React-jsi: 3fe2db643751becdf3511b77dcb84b68a04b52c4 - React-jsiexecutor: f7a04e9374dbfa320089064f4e6f2c9e10d0740a - React-jsinspector: 0f08037401626246e5c760871a023769b9815619 - React-logger: 0a8e62c840f534936c2cb2c96d0e6d507010e862 + RCTRequired: 329ead02b8edd20fb186d17745a9cadd5ce2922d + RCTTypeSafety: 698418021f8b47d82c058f3115c0026d1874a3ef + React: efefef133cf808a2d6edd1feedf2163d4d7a2922 + React-bridging: c12b25793db0e04c377055b4ddc9db6641be0536 + React-callinvoker: fbb9bbfe86f48efb712149d6c83ec74533e45095 + React-Codegen: 3398733e53c4106cc6fc7602c159669b5fbc1b14 + React-Core: 750c6a39b95c0b427b7624ff48cf1482f05ecf3f + React-CoreModules: 64bec7f728f87706c6512c2e8ca8cdb4f6f41ee3 + React-cxxreact: b515bc7e8b44b4c76ec7f030b00cb11c95692fa0 + React-hermes: 2c7c36834cdbd32b959333fbc17794209f18ecb0 + React-jsi: 9ae06bc7d17e61cee886e985e69f8fa3ef39334a + React-jsiexecutor: 523e742f144a346f7df32dea4fe1944d39b02473 + React-jsinspector: 7b02a02b9b9bf830102394039c80b3bf2e0200b0 + React-logger: b2c47bb0829c3c45ba3a04add9a2b4aea3f3dd4e react-native-blob-util: c3b0faecd2919db568e9d552084396f3e50b57c7 react-native-cameraroll: 2957f2bce63ae896a848fbe0d5352c1bd4d20866 react-native-config: 7cd105e71d903104e8919261480858940a6b9c0e react-native-document-picker: f68191637788994baed5f57d12994aa32cf8bf88 react-native-flipper: dc5290261fbeeb2faec1bdc57ae6dd8d562e1de4 react-native-image-manipulator: c48f64221cfcd46e9eec53619c4c0374f3328a56 - react-native-image-picker: cd420f97f6ed6ff74fc4686d27dbcfdbd051db91 + react-native-image-picker: f2ab1215d17bcfe27b0eb6417cc236fd1f4775e7 react-native-netinfo: 1a6035d3b9780221d407c277ebfb5722ace00658 react-native-pdf: 33c622cbdf776a649929e8b9d1ce2d313347c4fa react-native-plaid-link-sdk: 77052f329310ff5a36ddda276793f40d27c02bc4 @@ -989,18 +989,18 @@ SPEC CHECKSUMS: react-native-render-html: 96c979fe7452a0a41559685d2f83b12b93edac8c react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a react-native-webview: e771bc375f789ebfa02a26939a57dbc6fa897336 - React-perflogger: d4c9c4cfcc30a0d6cca35ddbd40a85ad4d3e4db1 - React-RCTActionSheet: fe551971745a6b04447a2c04f3d2b26fa5e3728f - React-RCTAnimation: 3a02fced1ff92012a71d4304769c2d430c7a9866 - React-RCTBlob: 9269e1c1fd754d7e8bb8c8a1d0178dc678a9f32f - React-RCTImage: 80c98b6b77063ebe851692000f54fbb9448d8e27 - React-RCTLinking: 7209ca06d58b04ad68148eeaa704f179e05f114b - React-RCTNetwork: 3ef476f0a3d43b7db36217a6f1e197517e6b750b - React-RCTSettings: 9e3dc3833f246062e91a70fed535ccb8c9f6d8c9 - React-RCTText: 89a452bfdb56e0aec4428d083626582a20d07910 - React-RCTVibration: b49dd0970d37e18c716228fce87936b578b7390c - React-runtimeexecutor: a0bd76a1162262d2945d467f6b978116e740904f - ReactCommon: cf8ef38ad293cc8a30b02f858bd16719b64a985b + React-perflogger: b231fb9993c1b5f74e32f0a3473225f9ebaf73d3 + React-RCTActionSheet: 9064b3b78118a253f2d6a63153f6dfff0b38f19f + React-RCTAnimation: d93c521d4ad6457fc8c1d9830ffb0495286ea036 + React-RCTBlob: 3121c9d4416d1d4c8d05a600f7a27da85458a277 + React-RCTImage: fac3e6e809d2e79669cc9deec9e4802dde9d73cd + React-RCTLinking: 23718d841e65fe258dd64e9cc0681d6767f89196 + React-RCTNetwork: 1bf07637ebb27f8241557e85871f7af990238130 + React-RCTSettings: 02f399b023b23a853eeda24879f4703755ffc996 + React-RCTText: c916d8da274c9823aaed9f53c007ecfa6e802764 + React-RCTVibration: eb5fb0bb3d78e31dcaeae5f127c75a7caf4b6af9 + React-runtimeexecutor: a8cee6fe3fb7994f07b735c7024a08a4fa5f8446 + ReactCommon: 1ebf2df5c764ebb52048e7a1cf42c75a6246171a RNCAsyncStorage: 0c357f3156fcb16c8589ede67cc036330b6698ca RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495 RNCPicker: 0b65be85fe7954fbb2062ef079e3d1cde252d888 @@ -1020,7 +1020,7 @@ SPEC CHECKSUMS: SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 urbanairship-react-native: 7e2e9a84c541b1d04798e51f7f390a2d5806eac0 - Yoga: affc5393470ecec3069bd7bf05d5877afffff995 + Yoga: f77f6497bccebdcbc8efb03dbf83eadfdec6d104 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 48093a300788c218e76f70cf6d102915cd993f34 diff --git a/package-lock.json b/package-lock.json index 8db9fac6149a..bf795f4b3edb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -56,7 +56,7 @@ "react-collapse": "^5.1.0", "react-content-loader": "^6.1.0", "react-dom": "18.1.0", - "react-native": "npm:@expensify/react-native@0.70.4-alpha.1", + "react-native": "npm:@expensify/react-native@0.70.4-alpha.2", "react-native-blob-util": "^0.16.2", "react-native-collapsible": "^1.6.0", "react-native-config": "^1.4.5", @@ -35213,9 +35213,9 @@ }, "node_modules/react-native": { "name": "@expensify/react-native", - "version": "0.70.4-alpha.1", - "resolved": "https://registry.npmjs.org/@expensify/react-native/-/react-native-0.70.4-alpha.1.tgz", - "integrity": "sha512-kXVxU+ni4SnJgCAENaS8ri/CwO2lt1Yqu0y0Y9SjCgayk2ZsSXsp13ajYfICOpPfrOLRvMjQE8cAMQuuzDqovg==", + "version": "0.70.4-alpha.2", + "resolved": "https://registry.npmjs.org/@expensify/react-native/-/react-native-0.70.4-alpha.2.tgz", + "integrity": "sha512-JpB56JP1YXrhuV4TQTVGJNppWcrCcfCvkk5hZhOieArfmi7iJsoCF3urLEj88EZmAHrnf7DrQgOYki++hVwg7A==", "dependencies": { "@jest/create-cache-key-function": "^29.0.3", "@react-native-community/cli": "9.2.1", @@ -69510,9 +69510,9 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "react-native": { - "version": "npm:@expensify/react-native@0.70.4-alpha.1", - "resolved": "https://registry.npmjs.org/@expensify/react-native/-/react-native-0.70.4-alpha.1.tgz", - "integrity": "sha512-kXVxU+ni4SnJgCAENaS8ri/CwO2lt1Yqu0y0Y9SjCgayk2ZsSXsp13ajYfICOpPfrOLRvMjQE8cAMQuuzDqovg==", + "version": "npm:@expensify/react-native@0.70.4-alpha.2", + "resolved": "https://registry.npmjs.org/@expensify/react-native/-/react-native-0.70.4-alpha.2.tgz", + "integrity": "sha512-JpB56JP1YXrhuV4TQTVGJNppWcrCcfCvkk5hZhOieArfmi7iJsoCF3urLEj88EZmAHrnf7DrQgOYki++hVwg7A==", "requires": { "@jest/create-cache-key-function": "^29.0.3", "@react-native-community/cli": "9.2.1", diff --git a/package.json b/package.json index c4c8e7329818..969f84d4c325 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "react-collapse": "^5.1.0", "react-content-loader": "^6.1.0", "react-dom": "18.1.0", - "react-native": "npm:@expensify/react-native@0.70.4-alpha.1", + "react-native": "npm:@expensify/react-native@0.70.4-alpha.2", "react-native-blob-util": "^0.16.2", "react-native-collapsible": "^1.6.0", "react-native-config": "^1.4.5", diff --git a/src/components/InvertedFlatList/BaseInvertedFlatList.js b/src/components/InvertedFlatList/BaseInvertedFlatList.js index 71028c7a760b..f8ea7b5d9ed2 100644 --- a/src/components/InvertedFlatList/BaseInvertedFlatList.js +++ b/src/components/InvertedFlatList/BaseInvertedFlatList.js @@ -134,7 +134,6 @@ class BaseInvertedFlatList extends Component { // eslint-disable-next-line react/jsx-props-no-spreading {...this.props} ref={this.props.innerRef} - inverted renderItem={this.renderItem} sizeMap={this.sizeMap} diff --git a/src/components/InvertedFlatList/index.android.js b/src/components/InvertedFlatList/index.android.js new file mode 100644 index 000000000000..779e430f94d8 --- /dev/null +++ b/src/components/InvertedFlatList/index.android.js @@ -0,0 +1,24 @@ +import React, {forwardRef} from 'react'; +import {View} from 'react-native'; +import BaseInvertedFlatList from './BaseInvertedFlatList'; +import styles from '../../styles/styles'; + +const InvertedCell = props => ( + // eslint-disable-next-line react/jsx-props-no-spreading + +); + +export default forwardRef((props, ref) => ( + +)); diff --git a/src/components/InvertedFlatList/index.native.js b/src/components/InvertedFlatList/index.ios.js similarity index 94% rename from src/components/InvertedFlatList/index.native.js rename to src/components/InvertedFlatList/index.ios.js index e34d2d260289..d502162fe7bb 100644 --- a/src/components/InvertedFlatList/index.native.js +++ b/src/components/InvertedFlatList/index.ios.js @@ -6,5 +6,6 @@ export default forwardRef((props, ref) => ( // eslint-disable-next-line react/jsx-props-no-spreading {...props} ref={ref} + inverted /> )); diff --git a/src/components/InvertedFlatList/index.js b/src/components/InvertedFlatList/index.js index a6a2dc688fc5..55efffed6293 100644 --- a/src/components/InvertedFlatList/index.js +++ b/src/components/InvertedFlatList/index.js @@ -41,6 +41,7 @@ class InvertedFlatList extends React.Component { this.list = el} shouldMeasureItems contentContainerStyle={StyleSheet.compose(this.props.contentContainerStyle, styles.justifyContentEnd)} diff --git a/src/styles/styles.js b/src/styles/styles.js index 0d4e97012dec..36dba1c30ae8 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -2633,6 +2633,11 @@ const styles = { transform: [{scale: 0}], }, + invert: { + // It's important to invert the Y AND X axis to prevent a react native issue that can lead to ANRs on android 13 + transform: [{scaleX: -1}, {scaleY: -1}], + }, + keyboardShortcutModalContainer: { maxHeight: '100%', flex: '0 0 auto',