resolve merge conflicts

Author: Shahidullah-Muffakir

.github/workflows/createNewVersion.yml

@@ -129,7 +129,18 @@ jobs:
             ./iOS/SmartScanExtension/Info.plist \
             ./iOS/NotificationServiceExtension/Info.plist
           git commit -m "Update version to ${{ steps.bumpVersion.outputs.NEW_VERSION }}"
-          git push origin main
+          if ! git push origin main; then
+            echo "Race condition! Mobile-Expensify main was updated while this workflow was running, so push failed. Fetching remote, rebasing, and retrying push once."
+            git fetch origin main --depth=1
+            if ! git rebase origin/main; then
+              echo "::error:: Rebase failed while retrying Mobile-Expensify push"
+              exit 1
+            fi
+            if ! git push origin main; then
+              echo "::error:: Mobile-Expensify change failed to push after rebase"
+              exit 1
+            fi
+          fi
 
       - name: Commit new E/App version
         run: |
@@ -146,7 +157,18 @@ jobs:
         run: |
           git add Mobile-Expensify
           git commit -m "Update Mobile-Expensify submodule version to ${{ steps.bumpVersion.outputs.NEW_VERSION }}"
-          git push origin main
+          if ! git push origin main; then
+            echo "Race condition! E/App main was updated while this workflow was running, so push failed. Fetching remote, rebasing, and retrying push once."
+            git fetch origin main --depth=1
+            if ! git rebase origin/main; then
+              echo "::error:: Rebase failed while retrying Mobile-Expensify push"
+              exit 1
+            fi
+            if ! git push origin main; then
+              echo "::error:: Mobile-Expensify change failed to push after rebase"
+              exit 1
+            fi
+          fi
 
       - name: Announce failed workflow in Slack
         if: ${{ failure() }}

.github/workflows/deploy.yml

@@ -599,7 +599,7 @@ jobs:
 
       - name:  🚀 Create release 🚀
         run: |
-          gh release create ${{ needs.prep.outputs.TAG }} ${{ github.ref == 'refs/heads/staging' && '--prerelease' }} \
+          gh release create ${{ needs.prep.outputs.TAG }} ${{ github.ref == 'refs/heads/staging' && '--prerelease' || '' }} \
             --repo ${{ github.repository }} \
             --title ${{ needs.prep.outputs.TAG }} \
             --generate-notes \

Gemfile

@@ -6,7 +6,7 @@ ruby ">= 3.3.4"
 gem "cocoapods", "= 1.15.2"
 gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
 gem 'xcodeproj', '< 1.26.0'
-gem "fastlane", "~> 2", ">= 2.222.0"
+gem "fastlane", "~> 2", ">= 2.227.1"
 gem "xcpretty", "~> 0"
 
 

Gemfile.lock

@@ -81,7 +81,7 @@ GEM
       highline (~> 2.0.0)
     concurrent-ruby (1.3.3)
     declarative (0.0.20)
-    digest-crc (0.6.5)
+    digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.6.20240107)
     dotenv (2.8.1)
@@ -118,8 +118,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.3.1)
-    fastlane (2.225.0)
+    fastimage (2.4.0)
+    fastlane (2.227.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -159,7 +159,7 @@ GEM
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
+      xcpretty (~> 0.4.1)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-aws_s3 (2.1.0)
       apktools (~> 0.7)
@@ -197,12 +197,12 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.31.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.7.1)
+    google-cloud-core (1.8.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.4.0)
+    google-cloud-errors (1.5.0)
     google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
@@ -218,7 +218,7 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.7)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     i18n (1.14.5)
@@ -241,9 +241,9 @@ GEM
     naturally (2.2.1)
     netrc (0.11.0)
     nkf (0.2.0)
-    optparse (0.5.0)
+    optparse (0.6.0)
     os (1.1.4)
-    plist (3.7.1)
+    plist (3.7.2)
     public_suffix (4.0.7)
     rake (13.2.1)
     representable (3.2.0)
@@ -252,7 +252,7 @@ GEM
       uber (< 0.2.0)
     retriable (3.1.2)
     rexml (3.3.9)
-    rouge (2.0.7)
+    rouge (3.28.0)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -288,8 +288,8 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+    xcpretty (0.4.1)
+      rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
@@ -303,7 +303,7 @@ PLATFORMS
 DEPENDENCIES
   activesupport (>= 6.1.7.5, != 7.1.0)
   cocoapods (= 1.15.2)
-  fastlane (~> 2, >= 2.222.0)
+  fastlane (~> 2, >= 2.227.1)
   fastlane-plugin-aws_s3
   fastlane-plugin-firebase_app_distribution
   xcodeproj (< 1.26.0)

Mobile-Expensify

@@ -458,20 +458,21 @@ You can only build HybridApp if you have been granted access to [`Mobile-Expensi
 ## Getting started with HybridApp
 
 1. If you haven't, please follow [these instructions](https://github.com/Expensify/App?tab=readme-ov-file#getting-started) to setup the NewDot local environment.
-2. Run `git submodule update --init --progress --depth 100` to download the `Mobile-Expensify` sourcecode.
-- If you have access to `Mobile-Expensify` and the command fails, add this to your `~/.gitconfig` file:
+2. In the root directory, run `git submodule init`
+3. Run `git submodule update`
+    - If this takes too long, try `git submodule update --init --progress --depth 100` (Note: this makes it difficult to checkout remote branches in the submodule)
+    - If you have access to `Mobile-Expensify` and the command fails, add this to your `~/.gitconfig` file:
 
     ```
     [url "https://github.com/"]
         insteadOf = ssh://git@github.com/
     ```
-- To prevent `Mobile-Expensify` submodule commit hash changes from appearing in `git status`, configure Git to ignore them by adding this to your local `.git/config`:
+    - To prevent `Mobile-Expensify` submodule commit hash changes from appearing in `git status`, configure Git to ignore them by adding this to your local `.git/config` (This ensures that submodule changes are ignored unless you deliberately update them):
     ```
     [submodule "Mobile-Expensify"]
         ignore = all
     ```
-    This ensures that submodule changes are ignored unless you deliberately update them.
-3. Run `git config --global submodule.recurse true` in order to have the submodule updated when you pull App
+4. Run `git config --global submodule.recurse true` in order to have the submodule updated when you pull App
 
 
 > [!Note]  
@@ -939,4 +940,4 @@ Onyx derived values are special Onyx keys which contain values derived from othe
 
 3. **Document derived values**
    - Explain the purpose and dependencies
-   - Document any special cases or performance considerations
+   - Document any special cases or performance considerations

README.md

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009012903
-        versionName "9.1.29-3"
+        versionCode 1009013000
+        versionName "9.1.30-0"
         // 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"

android/app/build.gradle

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import {exec} from 'child_process';
 import {app, BrowserWindow, clipboard, dialog, ipcMain, Menu, shell} from 'electron';
 import type {BaseWindow, BrowserView, MenuItem, MenuItemConstructorOptions, WebContents, WebviewTag} from 'electron';
@@ -138,119 +137,92 @@ 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 = (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'),
@@ -264,13 +236,11 @@ 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;
         });
@@ -340,7 +310,6 @@ const mainWindow = (): Promise<void> => {
 
     // Prod and staging set the icon in the electron-builder config, so only update it here for dev
     if (__DEV__) {
-        console.debug('CONFIG: ', CONFIG);
         app.dock.setIcon(`${__dirname}/../icon-dev.png`);
         app.setName('New Expensify Dev');
     }
@@ -686,21 +655,17 @@ 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', () => {