resolve conflicts

.well-known/apple-app-site-association

@@ -43,6 +43,10 @@
                     {
                         "/": "/statements/*",
                         "comment": "Wallet statements"
+                    },
+                    {
+                        "/": "/concierge/*",
+                        "comment": "Concierge"
                     }
                 ]
             }

android/app/build.gradle

@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001020800
-        versionName "1.2.8-0"
+        versionCode 1001021000
+        versionName "1.2.10-0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

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>
 

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');

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',
 

ios/NewExpensify/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.8</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.8.0</string>
+	<string>1.2.10.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.8</string>
+	<string>1.2.10</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.8.0</string>
+	<string>1.2.10.0</string>
 </dict>
 </plist>