Merge branch 'master' into Rory-SVGImageAssets

# Conflicts:
#	ios/Podfile.lock
#	metro.config.js

.github/workflows/e2e.yml

@@ -5,7 +5,7 @@ on:
         types: [opened, synchronize]
 
 env:
-    DEVELOPER_DIR: /Applications/Xcode_11.5.app/Contents/Developer
+    DEVELOPER_DIR: /Applications/Xcode_12.3.app/Contents/Developer
 
 jobs:
     test:

android/app/build.gradle

@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 304
-        versionName "1.0.1-303"
+        versionCode 308
+        versionName "1.0.1-307"
     }
     splits {
         abi {

babel.config.js

@@ -1,6 +1,8 @@
 const defaultPresets = ['@babel/preset-react', '@babel/preset-env'];
 const defaultPlugins = [
-    ['react-native-web', {commonjs: true}],
+    // Adding the commonjs: true option to react-native-web plugin can cause styling conflicts
+    ['react-native-web'],
+
     '@babel/transform-runtime',
     '@babel/plugin-proposal-class-properties',
 

.editorconfig → config/.editorconfig

@@ -3,9 +3,6 @@
 # Howto with your editor:
 #   Sublime: https://github.com/sindresorhus/editorconfig-sublime
 
-# top-most EditorConfig file
-root = true
-
 # Unix-style newlines with a newline ending every file
 [**]
 end_of_line = lf

index.js

@@ -4,8 +4,8 @@
 
 import {AppRegistry} from 'react-native';
 import App from './src/App';
-import {name as appName} from './app.json';
+import Config from './src/CONFIG';
 import additionalAppSetup from './src/setup';
 
-AppRegistry.registerComponent(appName, () => App);
+AppRegistry.registerComponent(Config.APP_NAME, () => App);
 additionalAppSetup();

ios/ExpensifyCash/AppDelegate.m

@@ -6,7 +6,6 @@
 #import <Firebase.h>
 
 #import <UserNotifications/UserNotifications.h>
-#import <RNCPushNotificationIOS.h>
 
 #ifdef FB_SONARKIT_ENABLED
 #import <FlipperKit/FlipperClient.h>
@@ -58,47 +57,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   return YES;
 }
 
-//Called when a notification is delivered to a foreground app.
--(void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler
-{
-  completionHandler(UNAuthorizationOptionSound | UNAuthorizationOptionAlert | UNAuthorizationOptionBadge);
-}
-
-// Required to register for notifications
-- (void)application:(UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings
-{
- [RNCPushNotificationIOS didRegisterUserNotificationSettings:notificationSettings];
-}
-// Required for the register event.
-- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
-{
- [RNCPushNotificationIOS didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
-}
-// Required for the notification event. You must call the completion handler after handling the remote notification.
-- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo
-fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler
-{
-  [RNCPushNotificationIOS didReceiveRemoteNotification:userInfo fetchCompletionHandler:completionHandler];
-}
-// Required for the registrationError event.
-- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error
-{
- [RNCPushNotificationIOS didFailToRegisterForRemoteNotificationsWithError:error];
-}
-// IOS 10+ Required for localNotification event
-- (void)userNotificationCenter:(UNUserNotificationCenter *)center
-didReceiveNotificationResponse:(UNNotificationResponse *)response
-         withCompletionHandler:(void (^)(void))completionHandler
-{
-  [RNCPushNotificationIOS didReceiveNotificationResponse:response];
-  completionHandler();
-}
-// IOS 4-10 Required for the localNotification event.
-- (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification
-{
- [RNCPushNotificationIOS didReceiveLocalNotification:notification];
-}
-
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 #if DEBUG

ios/ExpensifyCash/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>304</string>
+	<string>308</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false />
 	<key>LSRequiresIPhoneOS</key>

ios/ExpensifyCashTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>304</string>
+	<string>308</string>
 </dict>
 </plist>

ios/Podfile

@@ -20,5 +20,9 @@ target 'ExpensifyCash' do
   use_flipper!
   post_install do |installer|
     flipper_post_install(installer)
+
+    installer.pods_project.build_configurations.each do |config|
+      config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
+    end
   end
 end

ios/Podfile.lock

@@ -1,18 +1,18 @@
 PODS:
-  - Airship (14.0.1):
-    - Airship/Automation (= 14.0.1)
-    - Airship/Core (= 14.0.1)
-    - Airship/ExtendedActions (= 14.0.1)
-    - Airship/MessageCenter (= 14.0.1)
-  - Airship/Automation (14.0.1):
+  - Airship (14.2.0):
+    - Airship/Automation (= 14.2.0)
+    - Airship/Core (= 14.2.0)
+    - Airship/ExtendedActions (= 14.2.0)
+    - Airship/MessageCenter (= 14.2.0)
+  - Airship/Automation (14.2.0):
     - Airship/Core
-  - Airship/Core (14.0.1)
-  - Airship/ExtendedActions (14.0.1):
+  - Airship/Core (14.2.0)
+  - Airship/ExtendedActions (14.2.0):
     - Airship/Core
-  - Airship/MessageCenter (14.0.1):
+  - Airship/MessageCenter (14.2.0):
     - Airship/Core
   - boost-for-react-native (1.63.0)
-  - CocoaAsyncSocket (7.6.4)
+  - CocoaAsyncSocket (7.6.5)
   - CocoaLibEvent (1.0.0)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.63.3)
@@ -404,8 +404,6 @@ PODS:
     - React-Core
   - RNCAsyncStorage (1.12.1):
     - React-Core
-  - RNCPushNotificationIOS (1.6.1):
-    - React-Core
   - RNFBAnalytics (7.6.8):
     - Firebase/Analytics (~> 6.34.0)
     - React-Core
@@ -417,11 +415,11 @@ PODS:
     - Firebase/Crashlytics (~> 6.34.0)
     - React-Core
     - RNFBApp
+  - urbanairship-react-native (10.0.0):
+    - Airship (= 14.2.0)
+    - React-Core
   - RNSVG (12.1.0):
     - React
-  - urbanairship-react-native (9.0.1):
-    - Airship (= 14.0.1)
-    - React
   - Yoga (1.14.0)
   - YogaKit (1.18.1):
     - Yoga (~> 1.14)
@@ -484,7 +482,6 @@ DEPENDENCIES:
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
   - rn-fetch-blob (from `../node_modules/rn-fetch-blob`)
   - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
-  - "RNCPushNotificationIOS (from `../node_modules/@react-native-community/push-notification-ios`)"
   - "RNFBAnalytics (from `../node_modules/@react-native-firebase/analytics`)"
   - "RNFBApp (from `../node_modules/@react-native-firebase/app`)"
   - "RNFBCrashlytics (from `../node_modules/@react-native-firebase/crashlytics`)"
@@ -592,8 +589,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/rn-fetch-blob"
   RNCAsyncStorage:
     :path: "../node_modules/@react-native-community/async-storage"
-  RNCPushNotificationIOS:
-    :path: "../node_modules/@react-native-community/push-notification-ios"
   RNFBAnalytics:
     :path: "../node_modules/@react-native-firebase/analytics"
   RNFBApp:
@@ -608,9 +603,9 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  Airship: 842b4f28face4db0042a8a929703df33753ac033
+  Airship: 02ad73780f9eed21870e36b0aaab327acda6a102
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
-  CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
+  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
   DoubleConversion: cde416483dac037923206447da6e1454df403714
   FBLazyVector: 878b59e31113e289e275165efbe4b54fa614d43d
@@ -667,12 +662,11 @@ SPEC CHECKSUMS:
   ReactCommon: 4167844018c9ed375cc01a843e9ee564399e53c3
   rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
   RNCAsyncStorage: cb9a623793918c6699586281f0b51cbc38f046f9
-  RNCPushNotificationIOS: cfc6e1821f1af1874741d9b7055b75c0f8fa8a7d
   RNFBAnalytics: 2dc4dd9e2445faffca041b10447a23a71dcdabf8
   RNFBApp: 7eacc7da7ab19f96c05e434017d44a9f09410da8
   RNFBCrashlytics: 4870c14cf8833053b6b5648911abefe1923854d2
   RNSVG: ce9d996113475209013317e48b05c21ee988d42e
-  urbanairship-react-native: b948f8d55fff0013e595ebbe84804e46d18c745b
+  urbanairship-react-native: dfb6dc22b2f41ccaadd636b73d51b448cd1b2bbc
   Yoga: 7d13633d129fd179e01b8953d38d47be90db185a
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 

metro.config.js

@@ -1,29 +0,0 @@
-/**
- * Metro configuration for React Native
- * https://github.com/facebook/react-native
- *
- * @format
- */
-
-const {getDefaultConfig} = require('metro-config');
-
-module.exports = (async () => {
-    const {
-        resolver: {assetExts},
-    } = await getDefaultConfig();
-    return {
-        resolver: {
-            assetExts: assetExts.filter(ext => ext !== 'svg'),
-            sourceExts: ['jsx', 'js', 'ts', 'tsx', 'json', 'svg'],
-        },
-        transformer: {
-            getTransformOptions: async () => ({
-                transform: {
-                    experimentalImportSupport: false,
-                    inlineRequires: false,
-                },
-            }),
-            babelTransformerPath: require.resolve('react-native-svg-transformer'),
-        },
-    };
-})();