Merge branch 'main' into @szymczak/create-buttons

Author: sumo-slonik

.github/ISSUE_TEMPLATE/Accessibility.md

@@ -35,10 +35,12 @@ What can we do to fix the issue?
 Check off any platforms that are affected by this issue
 --->
 Which of our officially supported platforms is this issue occurring on? Please only tick the box if you have provided a screen-recording in the thread for each platform:
-- [ ] Android: Native
+- [ ] Android: App
 - [ ] Android: mWeb Chrome
-- [ ] iOS: Native
+- [ ] iOS: App
 - [ ] iOS: mWeb Safari
+- [ ] iOS: mWeb Chrome
+- [ ] Windows: Chrome
 - [ ] MacOS: Chrome / Safari
 - [ ] MacOS: Desktop
 

.github/ISSUE_TEMPLATE/Performance.md

@@ -25,12 +25,11 @@ Note: These should be the same as the benchmarks collected before any changes.
 
 ## Platforms:
 Select the officially supported platforms where the issue was reproduced:
-- [ ] Android: Standalone
-- [ ] Android: HybridApp
+- [ ] Android: App
 - [ ] Android: mWeb Chrome
-- [ ] iOS: Standalone
-- [ ] iOS: HybridApp
+- [ ] iOS: App
 - [ ] iOS: mWeb Safari
+- [ ] iOS: mWeb Chrome
 - [ ] Windows: Chrome
 - [ ] MacOS: Chrome / Safari
 - [ ] MacOS: Desktop
@@ -39,12 +38,11 @@ Select the officially supported platforms where the issue was reproduced:
   <summary>Platforms Tested:</summary>
 On which of our officially supported platforms was this issue tested:
 
-- [ ] Android: Standalone
-- [ ] Android: HybridApp
+- [ ] Android: App
 - [ ] Android: mWeb Chrome
-- [ ] iOS: Standalone
-- [ ] iOS: HybridApp
+- [ ] iOS: App
 - [ ] iOS: mWeb Safari
+- [ ] iOS: mWeb Chrome
 - [ ] Windows: Chrome
 - [ ] MacOS: Chrome / Safari
 - [ ] MacOS: Desktop

.github/ISSUE_TEMPLATE/Standard.md

@@ -10,7 +10,6 @@ ___
 **Version Number:**
 **Reproducible in staging?:**
 **Reproducible in production?:**
-**If this was caught on HybridApp, is this reproducible on New Expensify Standalone?:**
 **If this was caught during regression testing, add the test name, ID and link from TestRail:**
 **Email or phone of affected tester (no customers):**
 **Logs:** https://stackoverflow.com/c/expensify/questions/4856
@@ -32,12 +31,11 @@ Can the user still use Expensify without this being fixed? Have you informed the
 
 ## Platforms:
 Select the officially supported platforms where the issue was reproduced:
-- [ ] Android: Standalone
-- [ ] Android: HybridApp
+- [ ] Android: App
 - [ ] Android: mWeb Chrome
-- [ ] iOS: Standalone
-- [ ] iOS: HybridApp
+- [ ] iOS: App
 - [ ] iOS: mWeb Safari
+- [ ] iOS: mWeb Chrome
 - [ ] Windows: Chrome
 - [ ] MacOS: Chrome / Safari
 - [ ] MacOS: Desktop
@@ -46,12 +44,11 @@ Select the officially supported platforms where the issue was reproduced:
   <summary>Platforms Tested:</summary>
 On which of our officially supported platforms was this issue tested:
 
-- [ ] Android: Standalone
-- [ ] Android: HybridApp
+- [ ] Android: App
 - [ ] Android: mWeb Chrome
-- [ ] iOS: Standalone
-- [ ] iOS: HybridApp
+- [ ] iOS: App
 - [ ] iOS: mWeb Safari
+- [ ] iOS: mWeb Chrome
 - [ ] Windows: Chrome
 - [ ] MacOS: Chrome / Safari
 - [ ] MacOS: Desktop

.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:
@@ -43,9 +43,9 @@ jobs:
           submodules: true
           # Only fetch depth 0 for Mobile-Expensify, because it's a submodule and we need more history to cherry pick successfully
           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,21 +77,11 @@ 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: |
-          # Temporary hack during transition when -staging suffix is being added to tags
-          if git ls-remote origin refs/tags/${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }} | grep -q . ; then
-            git fetch origin main staging --no-recurse-submodules --no-tags --shallow-exclude ${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }}
-          else
-            git fetch origin main staging --no-recurse-submodules --no-tags --shallow-exclude ${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }}-staging
-          fi
+          git fetch origin main staging --no-recurse-submodules --no-tags --shallow-exclude ${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }}
           cd Mobile-Expensify
-          # Temporary hack during transition when -staging suffix is being added to tags
-          if git ls-remote origin refs/tags/${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }} | grep -q . ; then
-            git fetch origin main staging --no-recurse-submodules --no-tags --shallow-exclude ${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }}
-          else
-            git fetch origin main staging --no-recurse-submodules --no-tags --shallow-exclude ${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }}-staging
-          fi
+          git fetch origin main staging --no-recurse-submodules --no-tags --shallow-exclude ${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }}
 
       - name: Get E/App version bump commit
         id: getVersionBumpCommit

.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 1009013204
-        versionName "9.1.32-4"
+        versionCode 1009013305
+        versionName "9.1.33-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

@@ -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>