Merge branch 'main' into 289Adam289/57805-fix-filter-tooltip

Author: 289Adam289

.eslintrc.js

@@ -244,6 +244,13 @@ module.exports = {
                 property: 'getSize',
                 message: 'Usage of Image.getImage is restricted. Please use the `react-native-image-size`.',
             },
+            // Disallow direct HybridAppModule.isHybridApp() usage, because it requires a native call
+            // Use CONFIG.IS_HYBRID_APP, which keeps cached value instead
+            {
+                object: 'HybridAppModule',
+                property: 'isHybridApp',
+                message: 'Use CONFIG.IS_HYBRID_APP instead.',
+            },
         ],
         'no-restricted-imports': [
             'error',

.github/workflows/e2ePerformanceTests.yml

@@ -113,6 +113,8 @@ jobs:
 
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
+        with:
+          IS_DESKTOP_BUILD: 'true'
 
       - name: Make zip directory for everything to send to AWS Device Farm
         run: mkdir zip

.github/workflows/testBuild.yml

@@ -301,6 +301,7 @@ jobs:
     needs: [prep]
     secrets: inherit
     with:
+      APP_PR_NUMBER: ${{ github.event.inputs.PULL_REQUEST_NUMBER }}
       APP_REF: ${{ needs.prep.outputs.REF }}
       IOS_HYBRID: ${{ inputs.IOS_HYBRID }}
       ANDROID_HYBRID: ${{ inputs.ANDROID_HYBRID }}

.github/workflows/testBuildHybrid.yml

@@ -13,6 +13,10 @@ on:
         default: ''
   workflow_call:
     inputs:
+      APP_PR_NUMBER:
+        description: Pull Request number from App repo needed for download link construction
+        type: string
+        required: true
       APP_REF:
         description: Git ref to checkout in App
         type: string
@@ -34,8 +38,8 @@ on:
 
 
 env:
-  # This variable is needed for fastlane to construct correct path
-  PULL_REQUEST_NUMBER: ${{ github.event.inputs.APP_PULL_REQUEST_NUMBER || github.event.inputs.HYBRIDAPP_PULL_REQUEST_NUMBER }}
+  # This variable is needed for fastlane to construct correct path, -hybrid suffix is needed to distinguish hybrid apps from standalone New Dot 
+  PULL_REQUEST_NUMBER: ${{ github.event.inputs.APP_PULL_REQUEST_NUMBER || github.event.inputs.HYBRIDAPP_PULL_REQUEST_NUMBER || inputs.APP_PR_NUMBER}}-hybrid
 
 jobs:
   prep:
@@ -73,7 +77,7 @@ jobs:
         run: |
           set -e
 
-          if [[ ! -z "${{ inputs.APP_REF }}" ]]; then
+          if [[ -n "${{ inputs.APP_REF }}" ]]; then
             echo "REF=${{ inputs.APP_REF }}" >> "$GITHUB_OUTPUT"
             exit 0
           fi 

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009011101
-        versionName "9.1.11-1"
+        versionCode 1009011205
+        versionName "9.1.12-5"
         // 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

@@ -212,9 +212,6 @@ const showKeyboardShortcutsPage = (browserWindow: BrowserWindow) => {
 const electronUpdater = (browserWindow: BrowserWindow): PlatformSpecificUpdater => ({
     init: () => {
         autoUpdater.on(ELECTRON_EVENTS.UPDATE_DOWNLOADED, (info) => {
-            // eslint-disable-next-line no-console
-            console.group('[dev] ELECTRON_EVENTS.UPDATE_DOWNLOADED');
-            console.debug('[dev] info:', info);
             const systemMenu = Menu.getApplicationMenu();
             const updateMenuItem = systemMenu?.getMenuItemById(`update`);
             const checkForUpdatesMenuItem = systemMenu?.getMenuItemById(`checkForUpdates`);
@@ -230,39 +227,15 @@ const electronUpdater = (browserWindow: BrowserWindow): PlatformSpecificUpdater
             if (browserWindow.isVisible() && !isSilentUpdating) {
                 browserWindow.webContents.send(ELECTRON_EVENTS.UPDATE_DOWNLOADED, info.version);
             } else {
-                console.debug('[dev] else');
-
-                autoUpdater
-                    .checkForUpdates()
-                    .then((result) => {
-                        console.debug('[dev] result', result);
-                        if (result?.updateInfo.version === downloadedVersion) {
-                            console.debug('[dev] if - versions match, installing');
-                            quitAndInstallWithUpdate();
-                        } else {
-                            console.debug('[dev] else - downloading new update');
-                            return autoUpdater.downloadUpdate().then(() => {
-                                console.debug('[dev] download complete, installing');
-                                quitAndInstallWithUpdate();
-                            });
-                        }
-                    })
-                    .catch((error) => {
-                        console.debug('[dev] error', error);
-                        log.error('Error during update check or download:', error);
-                    });
+                quitAndInstallWithUpdate();
             }
-            // eslint-disable-next-line no-console
-            console.groupEnd();
         });
 
         ipcMain.on(ELECTRON_EVENTS.START_UPDATE, quitAndInstallWithUpdate);
         autoUpdater.checkForUpdates();
     },
     update: () => {
-        autoUpdater.checkForUpdates().then((result) => {
-            console.debug('[dev] update result', result);
-        });
+        autoUpdater.checkForUpdates();
     },
 });
 

desktop/main.ts

@@ -6,7 +6,7 @@
   "dependencies": {
     "electron-context-menu": "^2.3.0",
     "electron-log": "^4.4.8",
-    "electron-updater": "^6.5.0",
+    "electron-updater": "^6.6.0",
     "mime-types": "^2.1.35",
     "node-machine-id": "^1.1.12"
   },

desktop/package-lock.json

@@ -1,33 +1,44 @@
 ---
-title: Add personal Australian bank account
+title: Add a Personal Australian Bank Account
 description: Receive AUD reimbursements from an Australian employer by adding your banking information
 ---
+
 <div id="expensify-classic" markdown="1">
 
-{% include info.html %}
-The workspace must be set to AUD to use ABA batch reimbursements. For businesses that will also be reimbursing employees in other countries outside of Australia, you’ll need to set up Global Reimbursement instead. 
-{% include end-info.html %}
+Australian employees can connect a personal deposit-only bank account to receive reimbursements for their expense reports.  
+
+**Important Notes:**
+- The workspace currency must be set to AUD to use ABA batch reimbursements.  
+- If your company reimburses employees in multiple countries, set up **[Global Reimbursement](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Global-Reimbursements)** instead.  
+
+---
+
+# Add the Bank Account  
+
+1. Click your profile picture and select the workspace you want set as your default workspace. 
+2. Hover over **Settings**, then click **Account**.  
+3. Click the **Payments** tab.  
+4. Click **Add Deposit-Only Bank Account**.  
+5. Enter the required details:  
+   - **Account Holder Information**: Name, address, city, and country.  
+   - **Bank Details**: SWIFT code, bank name, address, and city.  
+   - **Account Information**: Account number and BSB number.  
+6. Click **Save & Continue**.  
 
-Australian employees can connect a personal deposit-only bank account to receive reimbursements for their expense reports. 
+## Troubleshooting Steps
 
-1. Click your profile picture and select the workspace you want to set as your default workspace. 
-2. Hover over **Settings**, then click **Account**.
-3. Click the **Payments** tab on the left.
-4. Click **Add Deposit-Only Bank Account**.
-5. Enter the company information. 
-   - Enter the account holder’s name, address, city, and country.
-   - Enter the swift code.
-   - Enter the bank’s name, address, and city.
-   - Enter the account number. 
-   - Enter the BSB number.  
+- If you don’t know your **Bank User ID/Direct Entry ID/APCA Number**, contact your bank.  
+- If you don’t see the required fields, your company hasn’t enabled reimbursements through Expensify. Contact your administrator for next steps.  
+
+---
 
-{% include info.html %}
-If you don’t know your Bank User ID/Direct Entry ID/APCA Number, contact your bank for this information. 
+# FAQ  
 
-If your screen does not contain the listed fields, your company hasn’t enabled reimbursements through Expensify. Contact your administrator for next steps. 
-{% include end-info.html %}
+## Why don’t I see the option to add a deposit-only bank account?  
+If your company hasn’t enabled reimbursements in Expensify, you won’t see this option. Contact your administrator for assistance.  
 
-{:start="6"}
-6. Click **Save & Continue**.
+## What if I don’t know my Bank User ID?  
+Your bank can provide this information. Contact them to confirm your **Bank User ID/Direct Entry ID/APCA Number**.  
 
-</div>
+## Can I add multiple bank accounts?  
+No, you can only add one deposit-only bank account per workspace for reimbursements.

desktop/package.json

@@ -2,40 +2,47 @@
 title: Connect personal bank account
 description: Receive reimbursements for expense reports submitted to your employer
 ---
+
 <div id="expensify-classic" markdown="1">
 
-Employees can connect a personal deposit-only bank account to receive reimbursements for their expense reports. 
+Employees can connect a personal deposit-only bank account to receive reimbursements for their expense reports.
+
+---
 
-To connect a deposit-only account,
+# Connect a Deposit-only Bank Account
 
 1. Hover over **Settings**, then click **Account**.
 2. Click the **Payments** tab on the left.
 3. Click **Add Deposit-Only Bank Account**, then click **Connect to your bank**.
 4. Click **Continue**.
-5. Search for your bank account in the list of banks and follow the prompts to sign in to your bank account.
-   - If your bank doesn’t appear, click the X in the right corner of the Plaid pop-up window, then click **Connect Manually**. You’ll then manually enter your account information and click **Save & Continue**. 
-6. Click **Save & Continue**.
-7. Enter the name, address, and phone number associated with the account. Then click **Save & Continue**.
+5. Search for your bank account in the list of banks
+6. Follow the prompts to sign in to your bank account using the corresponding username and password.
+   - If your bank doesn’t appear, click the **X** in the right corner of the Plaid pop-up window, then click **Connect Manually**. You’ll then manually enter your account information and click **Save & Continue**.
+7. Enter the name, address, and phone number associated with the account
+8. Click **Save & Continue**.
 
-You’ll now receive reimbursements for your expense reports and invoices directly to this bank account.
 
-{% include info.html %}
-If your organization has global reimbursement enabled and you want to add a bank account outside of the US, you can do so by following the steps above. However, after clicking on **Add Deposit-Only Bank Account**, look for a button that says **Switch Country**. This will allow you to add a deposit account from a supported country and receive reimbursements in your local currency.
-{% include end-info.html %}
+Once the bank account is connected to your Expensify account, future reimbursements will be deposited directly.
 
-{% include faq-begin.md %}
+## Using Global Reimbursement
 
-**I connected my deposit-only bank account. Why haven’t I received my reimbursement?**
+If your organization has global reimbursement enabled and you want to add a bank account outside the US, follow the steps above.
 
-There are a few reasons why you might not have received a reimbursement: 
-- The estimated deposit date on the report has not arrived yet.
-- The bank account information is incorrect. If you believe you may have entered the wrong account, contact the Concierge and provide the Report ID for the missing reimbursement.
-- Your account wasn’t set up for Direct Deposit/ACH. You can contact your bank to confirm.
+After clicking **Add Deposit-Only Bank Account**, under **Settings > Accounts > Payments**, click **Switch Country** at the top of the bank selection screen. This will allow you to add a deposit account from a supported country and receive reimbursements in your local currency.
 
-**What happens if my bank requires an additional security check before adding it to a third party?**
+---
+
+# FAQ
+
+## I connected my deposit-only bank account. Why haven’t I received my reimbursement?
+
+Check the following possible issues:
+- The estimated deposit date on the report has not arrived yet.
+- The bank account information is incorrect. If you believe you may have entered the wrong account, contact **Concierge (Expensify’s support team)** and provide the **Report ID** for the missing reimbursement.
+- Your bank account isn’t set up for **Direct Deposit/ACH** — please contact your bank to confirm.
 
-If your bank account has two-factor authentication (2FA) or another security step enabled, you should be prompted to complete this authentication step when connecting the account to Expensify. However, if you encounter an error during this process, you can close the pop-up window and select Connect Manually to add the account manually.
+## What happens if my bank requires an additional security check before adding it to a third party?
 
-{% include faq-end.md %}
+If your bank account has **two-factor authentication (2FA)** or another security step enabled, you should be prompted to complete this authentication step when connecting the account to Expensify.
 
-</div>
+However, if you encounter an error during this process, you can close the pop-up window and select **Connect Manually** to add the account manually.