Merge branch 'Expensify:main' into fix/ignore-scrolling-on-mobile-chorme-after-long-press

Author: linhvovan29546

.eslintignore

@@ -15,3 +15,4 @@ src/libs/SearchParser/searchParser.js
 src/libs/SearchParser/autocompleteParser.js
 help/_scripts/**
 Mobile-Expensify/**
+vendor

.eslintrc.js

@@ -237,6 +237,16 @@ module.exports = {
                 selector: 'TSEnumDeclaration',
                 message: "Please don't declare enums, use union types instead.",
             },
+
+            // These are the original rules from AirBnB's style guide, modified to allow for...of loops and for...in loops
+            {
+                selector: 'LabeledStatement',
+                message: 'Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand.',
+            },
+            {
+                selector: 'WithStatement',
+                message: '`with` is disallowed in strict mode because it makes code impossible to predict and optimize. It is also deprecated.',
+            },
         ],
         'no-restricted-properties': [
             'error',

.github/actions/javascript/authorChecklist/index.js

@@ -595,10 +595,10 @@ jobs:
 
       - name: 🚀 Create prerelease 🚀
         run: |
-          gh release create ${{ needs.prep.outputs.APP_VERSION }} --repo ${{ github.repository }} --title ${{ needs.prep.outputs.APP_VERSION }} --generate-notes --prerelease --target staging
+          gh release create ${{ needs.prep.outputs.APP_VERSION }}-staging --repo ${{ github.repository }} --title ${{ needs.prep.outputs.APP_VERSION }} --generate-notes --prerelease --verify-tag --target staging
           RETRIES=0
           MAX_RETRIES=10
-          until [[ $(gh release view ${{ needs.prep.outputs.APP_VERSION }} --repo ${{ github.repository }}) || $RETRIES -ge $MAX_RETRIES ]]; do
+          until [[ $(gh release view ${{ needs.prep.outputs.APP_VERSION }}-staging --repo ${{ github.repository }}) || $RETRIES -ge $MAX_RETRIES ]]; do
             echo "release not found, retrying $((MAX_RETRIES - RETRIES++)) times"
             sleep 1
           done
@@ -786,7 +786,7 @@ jobs:
     if: ${{ always() && fromJSON(needs.checkDeploymentSuccess.outputs.IS_AT_LEAST_ONE_PLATFORM_DEPLOYED) }}
     needs: [prep, android, desktop, ios, web, checkDeploymentSuccess, createPrerelease, finalizeRelease]
     with:
-      version: ${{ needs.prep.outputs.APP_VERSION }}
+      version: ${{ needs.prep.outputs.APP_VERSION }}${{ github.ref != 'refs/heads/production' && '-staging' || '' }}
       env: ${{ github.ref == 'refs/heads/production' && 'production' || 'staging' }}
       android: ${{ needs.android.result }}
       ios: ${{ needs.ios.result }}

.github/workflows/deploy.yml

@@ -0,0 +1,40 @@
+name: Remote Build Android
+
+on:
+  workflow_dispatch:
+  push:
+    branches-ignore: [staging, production]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest-xl
+    strategy:
+      matrix:
+        include:
+          - project_root: ./
+            variant: 'developmentDebug'
+
+          - project_root: Mobile-Expensify/
+            variant: 'Debug'
+    steps:
+      - name: Checkout
+        # v4
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+        with:
+          submodules: true
+          token: ${{ secrets.OS_BOTIFY_TOKEN }}
+
+      - name: Setup Node
+        uses: ./.github/actions/composite/setupNode
+
+      - name: RNEF Remote Build - Android
+        uses: callstackincubator/android@a49920aadab9f41951944ea52bb7983fa6b20b03
+        env:
+          PROJECT_ROOT_PATH: ${{ matrix.project_root }}
+        with:
+          variant: ${{ matrix.variant }}
+          github-token: ${{ github.token }}
+          comment-bot: false

.github/workflows/remote-build-android.yml

@@ -0,0 +1,44 @@
+name: Remote Build iOS
+
+on:
+  workflow_dispatch:
+  push:
+    branches-ignore: [staging, production]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  build:
+    runs-on: macos-15-xlarge
+    strategy:
+      matrix:
+        include:
+          - project_root: ./
+            scheme: 'New Expensify Dev'
+            configuration: 'DebugDevelopment'
+
+          - project_root: Mobile-Expensify/
+            scheme: 'Expensify Dev'
+            configuration: 'Debug'
+    steps:
+      - name: Checkout
+        # v4
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+        with:
+          submodules: true
+          token: ${{ secrets.OS_BOTIFY_TOKEN }}
+
+      - name: Setup Node
+        uses: ./.github/actions/composite/setupNode
+
+      - name: RNEF Remote Build - iOS
+        uses: callstackincubator/ios@4c2dcc0d6b9c35407cf294e17386b65258a3b6af
+        env:
+          PROJECT_ROOT_PATH: ${{ matrix.project_root }}
+        with:
+          destination: simulator
+          scheme: ${{ matrix.scheme }}
+          configuration: ${{ matrix.configuration }}
+          github-token: ${{ github.token }}
+          comment-bot: false

.github/workflows/remote-build-ios.yml

@@ -14,9 +14,7 @@ const main: StorybookConfig = {
         name: '@storybook/react-webpack5',
         options: {},
     },
-    docs: {
-        autodocs: false,
-    },
+    docs: {},
 };
 
 export default main;

.storybook/main.ts

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009012700
-        versionName "9.1.27-0"
+        versionCode 1009012702
+        versionName "9.1.27-2"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

Mobile-Expensify

@@ -128,6 +128,7 @@ process.argv.forEach((arg) => {
 let hasUpdate = false;
 let downloadedVersion: string;
 let isSilentUpdating = false;
+let isUpdateInProgress = false;
 
 // Note that we have to subscribe to this separately and cannot use translateLocal,
 // because the only way code can be shared between the main and renderer processes at runtime is via the context bridge
@@ -137,65 +138,119 @@ const preferredLocale: Locale = CONST.LOCALES.DEFAULT;
 const appProtocol = CONST.DEEPLINK_BASE_URL.replace('://', '');
 
 const quitAndInstallWithUpdate = () => {
+    console.debug('[dev] Attempting to quit and install update');
     if (!downloadedVersion) {
+        console.debug('[dev] No downloaded version available, skipping quit and install');
         return;
     }
+    console.debug(`[dev] Setting hasUpdate flag and installing version: ${downloadedVersion}`);
     hasUpdate = true;
     autoUpdater.quitAndInstall();
 };
 
-const verifyAndInstallLatestVersion = (): void => {
+const verifyAndInstallLatestVersion = (browserWindow: BrowserWindow): void => {
+    console.debug('[dev] Starting verifyAndInstallLatestVersion process');
+
+    if (!browserWindow || browserWindow.isDestroyed()) {
+        console.debug('[dev] Browser window is invalid or destroyed, skipping update check');
+        return;
+    }
+
+    // Prevent multiple simultaneous updates
+    if (isUpdateInProgress) {
+        console.debug('[dev] Update already in progress, skipping new update check');
+        return;
+    }
+
+    console.debug('[dev] Setting isUpdateInProgress flag and starting update check');
+    isUpdateInProgress = true;
+
     autoUpdater
         .checkForUpdates()
         .then((result) => {
+            console.debug('[dev] Update check completed', result?.updateInfo);
+
+            if (!browserWindow || browserWindow.isDestroyed()) {
+                console.debug('[dev] Browser window became invalid during update check, aborting');
+                isUpdateInProgress = false;
+                return;
+            }
+
             if (result?.updateInfo.version === downloadedVersion) {
+                console.debug(`[dev] Found matching version ${downloadedVersion}, proceeding with installation`);
                 return quitAndInstallWithUpdate();
             }
 
+            console.debug('[dev] New version found, starting download');
             return autoUpdater.downloadUpdate().then(() => {
+                console.debug('[dev] Download completed, proceeding with installation');
                 return quitAndInstallWithUpdate();
             });
         })
         .catch((error) => {
+            console.debug('[dev] Error during update check or download:', error);
             log.error('Error during update check or download:', error);
+        })
+        .finally(() => {
+            console.debug('[dev] Update process completed, resetting isUpdateInProgress flag');
+            isUpdateInProgress = false;
         });
 };
 
 /** Menu Item callback to trigger an update check */
 const manuallyCheckForUpdates = (menuItem?: MenuItem, browserWindow?: BaseWindow) => {
+    console.debug('[dev] Starting manual update check process');
+
+    // Prevent multiple simultaneous updates
+    if (isUpdateInProgress) {
+        console.debug('[dev] Update already in progress, skipping manual update check');
+        return;
+    }
+
     if (menuItem) {
+        console.debug('[dev] Disabling menu item during update check');
         // Disable item until the check (and download) is complete
         // eslint-disable-next-line no-param-reassign -- menu item flags like enabled or visible can be dynamically toggled by mutating the object
         menuItem.enabled = false;
     }
+
+    console.debug('[dev] Setting isUpdateInProgress flag and starting manual update check');
+    isUpdateInProgress = true;
+
     autoUpdater
         .checkForUpdates()
         .catch((error: unknown) => {
+            console.debug('[dev] Error during manual update check:', error);
             isSilentUpdating = false;
             return {error};
         })
         .then((result) => {
+            console.debug('[dev] Manual update check completed', result);
             const downloadPromise = result && 'downloadPromise' in result ? result.downloadPromise : undefined;
 
             if (!browserWindow) {
+                console.debug('[dev] No browser window available, skipping update dialogs');
                 return;
             }
 
             if (downloadPromise) {
+                console.debug('[dev] Update available, showing info dialog');
                 dialog.showMessageBox(browserWindow, {
                     type: 'info',
                     message: translate(preferredLocale, 'checkForUpdatesModal.available.title'),
                     detail: translate(preferredLocale, 'checkForUpdatesModal.available.message', {isSilentUpdating}),
                     buttons: [translate(preferredLocale, 'checkForUpdatesModal.available.soundsGood')],
                 });
             } else if (result && 'error' in result && result.error) {
+                console.debug('[dev] Update check failed, showing error dialog');
                 dialog.showMessageBox(browserWindow, {
                     type: 'error',
                     message: translate(preferredLocale, 'checkForUpdatesModal.error.title'),
                     detail: translate(preferredLocale, 'checkForUpdatesModal.error.message'),
                     buttons: [translate(preferredLocale, 'checkForUpdatesModal.notAvailable.okay')],
                 });
             } else {
+                console.debug('[dev] No update available, showing info dialog');
                 dialog.showMessageBox(browserWindow, {
                     type: 'info',
                     message: translate(preferredLocale, 'checkForUpdatesModal.notAvailable.title'),
@@ -209,10 +264,13 @@ const manuallyCheckForUpdates = (menuItem?: MenuItem, browserWindow?: BaseWindow
             return downloadPromise;
         })
         .finally(() => {
+            console.debug('[dev] Manual update check completed, resetting flags');
             isSilentUpdating = false;
+            isUpdateInProgress = false;
             if (!menuItem) {
                 return;
             }
+            console.debug('[dev] Re-enabling menu item');
             // eslint-disable-next-line no-param-reassign
             menuItem.enabled = true;
         });
@@ -245,12 +303,12 @@ const electronUpdater = (browserWindow: BrowserWindow): PlatformSpecificUpdater
             if (browserWindow.isVisible() && !isSilentUpdating) {
                 browserWindow.webContents.send(ELECTRON_EVENTS.UPDATE_DOWNLOADED, info.version);
             } else {
-                verifyAndInstallLatestVersion();
+                verifyAndInstallLatestVersion(browserWindow);
             }
         });
 
         ipcMain.on(ELECTRON_EVENTS.START_UPDATE, () => {
-            verifyAndInstallLatestVersion();
+            verifyAndInstallLatestVersion(browserWindow);
         });
         autoUpdater.checkForUpdates();
     },
@@ -398,7 +456,7 @@ const mainWindow = (): Promise<void> => {
                             {
                                 id: 'update',
                                 label: translate(preferredLocale, `desktopApplicationMenu.update`),
-                                click: verifyAndInstallLatestVersion,
+                                click: () => verifyAndInstallLatestVersion(browserWindow),
                                 visible: false,
                             },
                             {id: 'checkForUpdates', label: translate(preferredLocale, `desktopApplicationMenu.checkForUpdates`), click: manuallyCheckForUpdates},
@@ -628,11 +686,21 @@ const mainWindow = (): Promise<void> => {
                 });
 
                 app.on('before-quit', () => {
+                    console.debug('[dev] Application is preparing to quit');
                     // Adding __DEV__ check because we want links to be handled by dev app only while it's running
                     // https://github.com/Expensify/App/issues/15965#issuecomment-1483182952
                     if (__DEV__) {
+                        console.debug('[dev] Removing protocol client in dev mode');
                         app.removeAsDefaultProtocolClient(appProtocol);
                     }
+
+                    // Clean up update listeners and reset flags
+                    console.debug('[dev] Cleaning up update listeners and resetting flags');
+                    autoUpdater.removeAllListeners();
+                    isUpdateInProgress = false;
+                    isSilentUpdating = false;
+
+                    console.debug('[dev] Setting quitting flag to true');
                     quitting = true;
                 });
                 app.on('activate', () => {