Merge branch 'main' of github.com:Expensify/App into jnowakow/fix-59927

Author: jnowakow

.github/workflows/cherryPick.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       PULL_REQUEST_URL:
-        description: The full URL of the Expensify/App pull request to cherry-pick
+        description: The full URL of the E/App or E/Mobile-Expensify pull request to cherry-pick
         required: true
 
 jobs:
@@ -45,7 +45,7 @@ jobs:
           fetch-depth: 0
 
       - name: Checkout staging branch without full history if cherry picking App
-        if: ${{ steps.getPRInfo.outputs.REPO_FULL_NAME == 'Expensify/App' }}
+        if: ${{ steps.getPRInfo.outputs.REPO_FULL_NAME == github.repository }}
         # v4
         uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
         with:
@@ -77,7 +77,7 @@ jobs:
           SEMVER_LEVEL: "PATCH"
 
       - name: Fetch history of relevant refs if cherry picking an App change
-        if: ${{ steps.getPRInfo.outputs.REPO_FULL_NAME == 'Expensify/App' }}
+        if: ${{ steps.getPRInfo.outputs.REPO_FULL_NAME == github.repository }}
         run: |
           git fetch origin main staging --no-recurse-submodules --no-tags --shallow-exclude ${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }}
           cd Mobile-Expensify

.github/workflows/publishReactNativeAndroidArtifacts.yml

@@ -69,14 +69,14 @@ jobs:
       - name: Check if patches changed
         id: didPatchesChange
         run: |
-          if git diff --exit-code --name-only ${{ steps.getOldAppHash.outputs.HASH }}..${{ steps.getNewAppHash.outputs.HASH }} -- patches/react-native+*.patch patches/@react-native+*.patch; then
+          if ! git diff --exit-code --name-only ${{ steps.getOldAppHash.outputs.HASH }}..${{ steps.getNewAppHash.outputs.HASH }} -- patches/react-native+*.patch patches/@react-native+*.patch; then
             echo "::notice::Detected changes in patches"
             echo "DID_PATCHES_CHANGE=true" >> "$GITHUB_OUTPUT"
             exit 0
           fi
 
           if [[ '${{ matrix.is_hybrid }}' == 'true' ]]; then
-            if git -C Mobile-Expensify diff --exit-code --name-only ${{ steps.getOldMobileExpensifyHash.outputs.HASH }}..${{ steps.getNewMobileExpensifyHash.outputs.HASH }} -- patches/react-native+*.patch patches/@react-native+*.patch; then
+            if ! git -C Mobile-Expensify diff --exit-code --name-only ${{ steps.getOldMobileExpensifyHash.outputs.HASH }}..${{ steps.getNewMobileExpensifyHash.outputs.HASH }} -- patches/react-native+*.patch patches/@react-native+*.patch; then
               echo "::notice::Detected changes in patches"
               echo "DID_PATCHES_CHANGE=true" >> "$GITHUB_OUTPUT"
               exit 0

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009013207
-        versionName "9.1.32-7"
+        versionCode 1009013303
+        versionName "9.1.33-3"
         // 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

@@ -11,9 +11,9 @@
 - [ ] I included screenshots or videos for tests on [all platforms](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms)
 - [ ] I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
 - [ ] I verified tests pass on **all platforms** & I tested again on:
-    - [ ] Android: Native
+    - [ ] Android: HybridApp
     - [ ] Android: mWeb Chrome
-    - [ ] iOS: Native
+    - [ ] iOS: HybridApp
     - [ ] iOS: mWeb Safari
     - [ ] MacOS: Chrome / Safari
     - [ ] MacOS: Desktop
@@ -62,7 +62,7 @@
 
 ### Screenshots/Videos
 <details>
-<summary>Android: Native</summary>
+<summary>Android: HybridApp</summary>
 
 <!-- add screenshots or videos here -->
 
@@ -76,7 +76,7 @@
 </details>
 
 <details>
-<summary>iOS: Native</summary>
+<summary>iOS: HybridApp</summary>
 
 <!-- add screenshots or videos here -->
 

contributingGuides/REVIEWER_CHECKLIST.md

@@ -39,37 +39,36 @@ You’ll now receive payments for invoices directly into this bank account.
 - US-issued ID
 - The company address must be in the US
 - The controlling officer (the member initiating the connection to the bank account)'s address must be in the US
-- The controlling officer must have a US-issued social security number
-- **Important:** The person adding the bank account doesn’t need to be an account signer but they must enter their own personal information when connecting the bank account. If another person enters their details, the account will be flagged for review, delaying verification.
+- The controlling officer must have a U.S.-issued Social Security number
+
+**Important:** The person adding the bank account doesn’t need to be an account signer but they must enter their own personal information when connecting the bank account. If another person enters their details, the account will be flagged for review, delaying verification.
 
 ## Step 1: Connect the Bank Account
 
-1. Hover over **Settings**, then click **Account**.
-3. Click the **Wallet** and scroll to **Bank Accounts**.
-4. Choose **Add verified bank account** > **Connect to your bank**.
-6. Click **Continue**.
-7. Enter your phone number and click **Continue**.
-8. Select your bank and login.
+1. Head to **Settings > Account > Wallet > Bank Accounts**.
+2. Choose **Add verified bank account** > **Connect to your bank**.
+3. Click **Continue**.
+4. Enter your phone number and click **Continue**.
+5. Select your bank and login.
    - If your bank isn’t listed, click the **X**, select **Connect manually**, enter details, check the box, and click **Save & continue**.
-9. Click **Allow**.
-10. Ensure the correct account is selected and click **Save & continue**.
-11. Enter company details:
+6. Click **Allow**.
+7. Ensure the correct account is selected and click **Save & continue**.
+8. Enter company details:
     - **Legal business name**
     - **Physical company address** (U.S. address only, no P.O. boxes)
     - **Company phone number**
     - **Company website** (required for Expensify Card/payments, e.g., `https://www.expensify.com`)
     - **Tax Identification Number (TIN)**
     - **Company incorporation type, date, and state**
     - **Industry Classification Code** ([Find yours here](https://www.sec.gov/corpfin/division-of-corporation-finance-standard-industrial-classification-sic-code-list))
-12. Enter your personal information, including a U.S. address and SSN, and click **Save & continue**.
-13. Verify your identity by uploading:
+9. Enter your personal information, including a U.S. address and SSN, and click **Save & continue**.
+10. Verify your identity by uploading:
     - A **photo ID** (passport or identity card, must be valid and U.S.-issued)
     - A **short video** of yourself
-14. If applicable, check **Additional Information**:
+11. If applicable, check **Additional Information**:
     - If an individual owns 25% or more of the business, their personal details must be provided.
     - If the business is a **non-profit**, leave the boxes unchecked.
-15. Agree to the terms by selecting the checkboxes.
-16. Click **Save & continue**.
+12. Agree to the terms by selecting the checkboxes and clicking **Save & continue**.
 
 ## Step 2: Verify the Bank Account
 
@@ -81,10 +80,9 @@ Expensify will send **three test transactions** within **1-2 business days**. To
 
 ## Step 3: Add the Bank Account to the Workspace
 
-1. Hover over **Settings**, then click **Workspaces**.
-2. Click the desired workspace.
-3. Click the **Reimbursement** tab.
-4. Click **Direct**, then **Add business bank account** and select the account.
+1. Head to **Settings > Workspace > [Workspace Name] > Workflows > Make or track payments**.
+2. Click **Direct**.
+3. Choose **Add business bank account**, and select the account.
 
 ---
 
@@ -132,7 +130,7 @@ If automatic verification fails, manual verification may require documents like:
 - **Business address verification**
 - **Bank letter confirming account ownership**
 
-For details, contact Concierge.
+For details, contact Concierge Support.
 
 ## What if I don’t see all three test transactions?
 
@@ -168,9 +166,9 @@ Yes, Expensify **cannot process direct payments** for businesses in:
 - Casinos & Gambling/Betting Services
 - Non-FI, Money Orders
 - Wires, Money Orders
-- Government Owned Lotteries
-- Government Licensed Online Casinos (Online Gambling)
-- Government Licensed Horse/Dog Racing
+- Government-Owned Lotteries
+- Government-Licensed Online Casinos (Online Gambling)
+- Government-Licensed Horse/Dog Racing
 - Crypto-currency businesses
 - Internet gambling
 - Marijuana-related businesses

docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account.md

@@ -15,14 +15,13 @@ If you'd like an option for direct international payments, consider setting up [
 
 # Setting Up ABA Payments
 
-1. Go to **Settings > Workspaces**.
-2. Select the workspace you want to configure.
-3. Click the **Reports** tab.
-4. In the **Report Currency** dropdown, select **AUD A$**.
-5. Click the **Reimbursement** tab.
-6. Set **Reimbursement Type** to **Indirect**.
-7. Enable the toggle.
+1. Go to **Settings > Workspaces [Workspace Name] > Overview**.
+2. In the **Report Currency** dropdown, select **AUD A$**.
+3. Navigate to **Settings > Workspaces [Workspace Name] > Workflows**.
+4. Scroll to **Make or track payments**
+5. Set **Reimbursement Type** to **Indirect**.
+6. Toggle **Collect bank account details** on.
 
-Once enabled, employees can submit expenses in AUD, and you can process reimbursements via ABA files.
+Once the setup is complete, employees can submit expenses in AUD, and you can process reimbursements via ABA files.
 
 </div>

docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Australian-Reimbursements.md

@@ -1,5 +1,5 @@
 ---
-title: Share-Verified-Business-Bank-Account.md
+title: Share Verified Business Bank Account
 description: Learn how to share access to a verified business bank account in Expensify to reimburse employees or pay vendor bills.
 keywords: [Expensify Classic, share bank account, reimburse, vendor payments, Workspace Admin]
 ---

docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Share-Verified-Business-Bank-Account.md

@@ -25,13 +25,14 @@ If your company’s business bank account is located in Australia, you can enabl
 ---
 
 # Step 1: Connect Your Australian Bank Account
-1. Go to **Settings > Workspaces > [Workspace Name] > Reports**.
-2. Ensure the workspace currency is set to **AUD**.
-3. Click the **Reimbursements** tab.
-4. Set the reimbursement method to **Direct**.
-5. Click **Add business bank account**.
-6. Choose **Australia** as the country and confirm the currency is AUD.
-7. Enter bank details and click **Save & Continue**.
+1. Go to **Settings > Workspaces [Workspace Name] > Overview**.
+2. In the **Report Currency** dropdown, select **AUD A$**.
+3. Navigate to **Settings > Workspaces [Workspace Name] > Workflows**.
+4. Scroll to **Make or track payments**
+5. Set **Reimbursement Type** to **Direct**.
+6. Click **Add business bank account**.
+7. Choose **Australia** as the country and confirm the currency is listed as AUD.
+8. Enter the bank details and click **Save & Continue**.
 
 ---
 
@@ -42,14 +43,14 @@ If your company’s business bank account is located in Australia, you can enabl
      - Bank statement or voided check
      - Proof of Beneficial Ownership
      - Certified ID & address for all signatories
-3. Expensify's Compliance Team will send the **PDS FSG paperwork** to your company's directors (the same company directors who are listed as signors on `Page 3` of the Partner Application Form).
+3. Expensify's Compliance Team will send the **PDS FSG paperwork** to your company's directors (the same company directors who are listed as signers on `Page 3` of the Partner Application Form).
 4. Our Compliance Team will review your form and contact you if additional information is required.
 
 ---
 
 # Step 3: Confirm Test Transactions
 1. **Expensify will send test deposits to the provided bank account:** Once those are sent, our support team will ask you to verify the deposit amounts.
-2. Once the test deposit amounts are confirmed, the bank account is verified to use for global reimbursement.
+2. Once the test deposit amounts are confirmed, the bank account is verified for global reimbursement.
 
 ---
 
@@ -58,8 +59,8 @@ If your company’s business bank account is located in Australia, you can enabl
 ⏳**Timeline:** From the time you submit all requested documentation, you can expect to start using global reimbursement within one to two weeks. Once the verification is complete, the bank account is typically ready to go within two business days
 
 Once the bank account is approved for global reimbursement:
-1. Go to **Settings > Workspaces > [Workspace Name] > Reimbursements**.
-2. Set the verified AUD account as the default reimbursement method.
+1. Go to **Settings > Workspaces > [Workspace Name] > Workflows**.
+2. Under **Make or track payments**, set the verified AUD account as the default reimbursement method.
 3.  Instruct employees to connect their deposit account:
    - Navigate to **Settings > Account > Wallet**.
    - Click **Add deposit-only bank account** and input their bank details.
@@ -69,7 +70,7 @@ Once the bank account is approved for global reimbursement:
 # FAQ
 
 ## What is a PDS FSG?
-It stands for Product Disclosure Statement & Financial Services Guide, a legal document sent to the company's directors. The **Corpay PDS FSG** paperwork must be sent to company directors for signing before onboarding begins.
+It stands for Product Disclosure Statement & Financial Services Guide, a legal document sent to the company's directors. The **Corpay PDS FSG** paperwork must be sent to the company directors for signing before onboarding begins.
 
 ## Can other admins send global reimbursements?
 Yes. Once verified, the reimbursement account can be shared with other workspace admins.

docs/articles/expensify-classic/bank-accounts-and-payments/payments/Global-Reimbursement-Australia.md

@@ -24,13 +24,14 @@ If your business bank account is based in Canada, you can send global reimbursem
 ---
 
 # Step 1: Connect Your Canadian Bank Account
-1. Go to **Settings > Workspaces > [Workspace Name] > Reports**.
-2. Confirm the workspace currency is set to **CAD**.
-3. Click the **Reimbursements** tab.
-4. Set the reimbursement method to **Direct**.
-5. Click **Add business bank account**.
-6. Click **Switch country** and set the **currency** to CAD.
-7. Enter your Canadian bank account details and click **Save & Continue**.
+1. Go to **Settings > Workspaces [Workspace Name] > Overview**.
+2. In the **Report Currency** dropdown, select **CAD**.
+3. Navigate to **Settings > Workspaces [Workspace Name] > Workflows**.
+4. Scroll to **Make or track payments**
+5. Set the reimbursement method to **Direct**.
+6. Click **Add business bank account**.
+7. Click **Switch country** and confirm the currency shows CAD.
+8. Enter your Canadian bank account details and click **Save & Continue**.
 
 ---
 
@@ -47,7 +48,7 @@ If your business bank account is based in Canada, you can send global reimbursem
 
 # Step 3: Confirm Test Transactions
 1. **Expensify will send test deposits to the provided bank account:** Once those are sent, our support team will ask you to verify the deposit amounts.
-2. Once the test deposit amounts are confirmed, the bank account is verified to use for global reimbursement.
+2. Once the test deposit amounts are confirmed, the bank account is verified for global reimbursement.
 
 ---
 
@@ -56,9 +57,10 @@ If your business bank account is based in Canada, you can send global reimbursem
 ⏳**Timeline:** From the time you submit all requested documentation, you can expect to start using global reimbursement within one to two weeks. Once the verification is complete, the bank account is typically ready to go within two business days
 
 After the account is verified:
-1. Go to **Settings > Workspaces > [Workspace Name] > Reimbursements**.
-2. Select the verified Canadian account as the default reimbursement method.
-3. Instruct employees to connect their deposit account:
+1. Go to **Settings > Workspaces > [Workspace Name] > Workflows**.
+2. Scroll to **Make or track payments**.
+3. Select the verified Canadian account as the default reimbursement method.
+4. Instruct employees to connect their deposit account:
    - Go to **Settings > Account > Wallet**.
    - Click **Add deposit-only bank account** and enter their deposit account details.
 

docs/articles/expensify-classic/bank-accounts-and-payments/payments/Global-Reimbursement-Canada.md

@@ -22,18 +22,19 @@ If your business operates in the European Union, you can send international reim
 
 ## Special Requirements:
 - 🇮🇹 **Italy:** Requires "Codice Fiscale" (Tax ID).
-- 🇪🇸 **Spain:** A driver’s license is not accepted as a valid form ID.
+- 🇪🇸 **Spain:** A driver’s license is not accepted as a valid form of ID.
 
 ---
 
 # Step 1: Connect Your EU Bank Account
-1. Go to **Settings > Workspaces > [Workspace Name] > Reports**.
-2. Confirm the workspace currency is **EUR**.
-3. Click the **Reimbursements** tab.
-4. Set the reimbursement method to **Direct**.
-5. Click **Add business bank account**.
-6. Select your country and make sure the currency is set to EUR.
-7. Enter your account details and click **Save & Continue**.
+1. Go to **Settings > Workspaces [Workspace Name] > Overview**.
+2. In the **Report Currency** dropdown, select **EUR**.
+3. Navigate to **Settings > Workspaces [Workspace Name] > Workflows**.
+4. Scroll to **Make or track payments**
+5. Set the reimbursement method to **Direct**.
+6. Click **Add business bank account**.
+7. Select your country and make sure the currency is set to EUR.
+8. Enter your account details and click **Save & Continue**.
 
 ---
 
@@ -62,7 +63,7 @@ If your business operates in the European Union, you can send international reim
 
 # Step 4: Confirm Test Payment
 1. **Expensify will send a test payment to the bank account:** Once sent, our support team will ask you to verify the payment amount.
-2. Once the test payment is confirmed, the bank account is verified to use for global reimbursement.
+2. Once the test payment is confirmed, the bank account is verified for global reimbursement.
 
 ---
 
@@ -71,9 +72,10 @@ If your business operates in the European Union, you can send international reim
 ⏳**Timeline:** After the executed mandate (authorization form) is signed and sent to your bank, it takes 10–12 business days for the bank account to be set up for direct debits.
 
 Once the bank account is approved for global reimbursement:
-1. Go to **Settings > Workspaces > [Workspace Name] > Reimbursements**.
-2. Choose your verified EU account as the default reimbursement method.
-3. Instruct employees to connect their deposit account:
+1. Go to **Settings > Workspaces > [Workspace Name] > Workflows**.
+2. Scroll to **Make or track payments**.
+3. Choose your verified EU account as the default reimbursement method.
+4. Instruct employees to connect their deposit account:
    - Go to **Settings > Account > Wallet**.
    - Click **Add deposit-only bank account** and input their account details.