Merge branch 'Expensify:main' into arrow-feature-signed

Expensify · Sep 30, 2022 · 4c76f2e · 4c76f2e
2 parents 16531eb + b299503
commit 4c76f2e
Show file tree

Hide file tree

Showing 126 changed files with 1,977 additions and 1,704 deletions.
diff --git a/.well-known/apple-app-site-association b/.well-known/apple-app-site-association
@@ -43,6 +43,10 @@
                     {
                         "/": "/statements/*",
                         "comment": "Wallet statements"
+                    },
+                    {
+                        "/": "/concierge/*",
+                        "comment": "Concierge"
                     }
                 ]
             }

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001020600
-        versionName "1.2.6-0"
+        versionCode 1001021000
+        versionName "1.2.10-0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -61,6 +61,7 @@
             <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/iou"/>
             <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/enable-payments"/>
             <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/statements"/>
+            <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/concierge"/>
 
             <!-- Staging URLs -->
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/r"/>
@@ -72,6 +73,7 @@
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/iou"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/enable-payments"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/statements"/>
+            <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/concierge"/>
         </intent-filter>
       </activity>
 

diff --git a/desktop/dev.js b/desktop/dev.js
@@ -0,0 +1,9 @@
+// Development entry point of the desktop app with support for live reload
+// We keep this file (dev.js) out Webpack bundling process and provide it raw to Electron
+// Reloading Electron on change requires some native Node dependencies which cannot be
+// easily bundled with webpack, and we don't really need them bundled for staging/prod
+// We are free to load any bundled code from this file, and we load the bundled main.js from dist
+
+// The `dist` folder is not part of the source and does not exist until we build or start Desktop
+// eslint-disable-next-line import/extensions
+require('./dist/main');
diff --git a/desktop/start.js b/desktop/start.js
@@ -9,25 +9,35 @@ portfinder.getPortPromise({
     port: basePort,
 }).then((port) => {
     const devServer = `webpack-dev-server --config config/webpack/webpack.dev.js --port ${port} --env platform=desktop`;
-    const buildMain = 'webpack --config config/webpack/webpack.desktop.js --config-name desktop-main --mode=development';
+    const buildMain = 'webpack watch --config config/webpack/webpack.desktop.js --config-name desktop-main --mode=development';
+
+    const env = {
+        PORT: port,
+        NODE_ENV: 'development',
+    };
 
     const processes = [
+        {
+            command: buildMain,
+            name: 'Main',
+            prefixColor: 'blue.dim',
+            env,
+        },
         {
             command: devServer,
             name: 'Renderer',
             prefixColor: 'red.dim',
+            env,
         },
         {
-            command: `${buildMain} && wait-port localhost:${port} && electron desktop/dist/main.js`,
-            name: 'Main',
+            command: `wait-port localhost:${port} && npx electronmon ./desktop/dev.js`,
+            name: 'Electron',
             prefixColor: 'cyan.dim',
-            env: {
-                PORT: port,
-                NODE_ENV: 'development',
-            },
+            env,
         },
     ];
-    concurrently(processes, {
+
+    return concurrently(processes, {
         inputStream: process.stdin,
         prefix: 'name',
 

diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss
@@ -61,6 +61,7 @@ body {
     height: 100%;
     min-height: 100%;
     background: $color-white;
+    overflow: auto;
 }
 
 hr {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.6</string>
+	<string>1.2.10</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.6.0</string>
+	<string>1.2.10.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.6</string>
+	<string>1.2.10</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.6.0</string>
+	<string>1.2.10.0</string>
 </dict>
 </plist>
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -217,9 +217,9 @@ PODS:
     - nanopb/encode (= 2.30908.0)
   - nanopb/decode (2.30908.0)
   - nanopb/encode (2.30908.0)
-  - Onfido (25.1.0)
-  - onfido-react-native-sdk (5.4.0):
-    - Onfido (= 25.1.0)
+  - Onfido (26.0.1)
+  - onfido-react-native-sdk (6.0.0):
+    - Onfido (= 26.0.1)
     - React
   - OpenSSL-Universal (1.1.1100)
   - Permission-LocationAccuracy (3.6.1):
@@ -941,8 +941,8 @@ SPEC CHECKSUMS:
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c
   nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
-  Onfido: a1645279c7b6ca8de5bb95d27af53c523ffd731c
-  onfido-react-native-sdk: cfdfd1d4acf53e469a82b9684f92982d39744bb8
+  Onfido: 91935f0dcee9a6647fdb386fa87cb4af9d9a3c70
+  onfido-react-native-sdk: bc72114ac430a2636cd2f02972ddf5b8b3b397c6
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
   Permission-LocationAccuracy: 76df17de5c6b8bc2eee34e61ee92cdd7a864c73d
   Permission-LocationAlways: 8d99b025c9f73c696e0cdb367e42525f2e9a26f2

diff --git a/jest/setup.js b/jest/setup.js
@@ -75,3 +75,14 @@ jest.mock('../src/components/Icon/Expensicons', () => {
         return {...prev, [key]: fn};
     }, {});
 });
+
+// Set up manual mocks for any Logging methods that are supposed hit the 'server',
+// this is needed because before, the Logging queue would get flushed while tests were running,
+// causing unexpected calls to HttpUtils.xhr() which would cause mock mismatches and flaky tests.
+/* eslint-disable no-console */
+jest.mock('../src/libs/Log', () => ({
+    info: message => console.log(`[info] ${message} (mocked)`),
+    alert: message => console.log(`[alert] ${message} (mocked)`),
+    warn: message => console.log(`[warn] ${message} (mocked)`),
+    hmmm: message => console.log(`[hmmm] ${message} (mocked)`),
+}));