Merge branch 'Expensify:main' into hotfix-fab-1

Author: adhorodyski

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009033903
-        versionName "9.3.39-3"
+        versionCode 1009034001
+        versionName "9.3.40-1"
         // 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

@@ -27,6 +27,7 @@ The navigation in the app is built on top of the `react-navigation` library. To
     - [Entry screens (access control)](#entry-screens-access-control)
     - [Current limitations (work in progress)](#current-limitations-work-in-progress)
     - [Multi-segment dynamic routes](#multi-segment-dynamic-routes)
+    - [Suffix layering (stacking dynamic routes)](#suffix-layering-stacking-dynamic-routes)
     - [Dynamic routes with query parameters](#dynamic-routes-with-query-parameters)
     - [How to add a new dynamic route](#how-to-add-a-new-dynamic-route)
     - [Migrating from backTo to dynamic routes](#migrating-from-backto-to-dynamic-routes)
@@ -701,7 +702,7 @@ A dynamic route is a URL suffix (e.g. `verify-account`) that can be appended to
 
 Do not use dynamic routes when:
 - Your use case falls under the [current limitations](#current-limitations-work-in-progress):
-  - You need to stack multiple dynamic route suffixes (e.g. `/a/verify-account/another-flow`).
+  - You need path parameters in dynamic suffixes (e.g. `a/:reportID`).
 - The screen has a single, fixed entry and a fixed back destination. In this case, use a normal static route instead.
 
 ### Dynamic routes configuration
@@ -732,10 +733,9 @@ When adding or extending a dynamic route, list every screen that should be able
 
 ### Current limitations (work in progress)
 
-- **Stacking:** Multiple dynamic route suffixes on top of each other (e.g. `/a/verify-account/another-flow`) are not supported. Only one dynamic suffix per path is allowed.
 - **Path parameters:** Suffixes must not include path params (e.g. `a/:reportID`). Query parameters are supported - see [Dynamic routes with query parameters](#dynamic-routes-with-query-parameters).
 
-If you try to use dynamic routes for these cases now, you will either fail to navigate to the page at all or end up on a non-existent page, and the navigation will be broken.
+If you try to use dynamic routes for this case now, you will either fail to navigate to the page at all or end up on a non-existent page, and the navigation will be broken.
 
 ### Multi-segment dynamic routes
 
@@ -751,6 +751,61 @@ For instance, if both `verify-account` and `add-bank-account/verify-account`
 are registered, a path ending with `/add-bank-account/verify-account`
 will always match the longer, more specific suffix.
 
+### Suffix layering (stacking dynamic routes)
+
+Dynamic route suffixes can be stacked on top of each other,
+producing URLs like `/base-path/suffix-a/suffix-b`.
+Each suffix in the chain is resolved recursively: the parser strips the outermost suffix first,
+resolves the remaining path (which may itself contain another dynamic suffix),
+and repeats until it reaches a static base path.
+
+For example, given the path `/settings/wallet/verify-account/country`:
+
+1. The outermost suffix `country` is identified and stripped, leaving `/settings/wallet/verify-account`.
+2. `/settings/wallet/verify-account` still contains a dynamic suffix `verify-account`, which is stripped to get `/settings/wallet`.
+3. `/settings/wallet` is a static path - standard React Navigation parsing returns the base state.
+4. The parser walks back up: it checks that the focused screen of `/settings/wallet` is listed in `VERIFY_ACCOUNT.entryScreens`.
+5. Then it checks that the focused screen of the resolved `/settings/wallet/verify-account` state is listed in `COUNTRY.entryScreens`.
+6. If all authorization checks pass, the final navigation state is built for the full path.
+
+#### Authorization per layer
+
+Each suffix independently validates access via its own `entryScreens` array.
+The focused screen resolved from the layer directly beneath must be listed
+in the current suffix's `entryScreens`. If any layer fails authorization,
+the path falls back to standard React Navigation parsing and a warning is logged.
+
+#### Configuration example
+
+```ts
+DYNAMIC_ROUTES: {
+    VERIFY_ACCOUNT: {
+        path: 'verify-account',
+        entryScreens: [SCREENS.SETTINGS.WALLET.ROOT, SCREENS.TRAVEL.MY_TRIPS],
+    },
+    ADDRESS_COUNTRY: {
+        path: 'country',
+        entryScreens: [SCREENS.SETTINGS.DYNAMIC_VERIFY_ACCOUNT],
+        getRoute: (country = '') => `country${country ? `?country=${country}` : ''}`,
+        queryParams: ['country'],
+    },
+},
+```
+
+With this configuration, `country` can be opened on top of `verify-account`
+because `DYNAMIC_VERIFY_ACCOUNT` is listed in `ADDRESS_COUNTRY.entryScreens`.
+Back navigation removes one suffix at a time:
+`/settings/wallet/verify-account/country` → `/settings/wallet/verify-account` → `/settings/wallet`.
+
+#### Multi-segment suffixes in layered paths
+
+Suffix layering works with multi-segment suffixes as well.
+For example, if `deep/verify-account` and `country` are both registered,
+the path `/settings/wallet/deep/verify-account/country` will first strip `country`,
+then strip `deep/verify-account`, and resolve `/settings/wallet` as the base.
+The matching algorithm always tests the longest candidate suffix first,
+so overlapping registrations are resolved deterministically.
+
 ### Dynamic routes with query parameters
 
 Dynamic route suffixes can carry query parameters

assets/images/luggage-with-lines-plus.svg

@@ -40,8 +40,6 @@ To share an existing account with other admins:
 
 ![Close the confirmation screen once the share is successful]({{site.url}}/assets/images/Help-ShareBankAccount-4.png){:width="100%"}
 
----
-
 ## What happens after sharing a business bank account
 
 - The shared-to admins will receive a Concierge message letting them know the account was shared.
@@ -55,6 +53,25 @@ To share an existing account with other admins:
 **For non-US accounts:**
 - The shared account is ready to use immediately — no test transactions required.
 
+## How business bank account sharing works when changing the payer
+
+When changing the **Authorized Payer** in a Workspace:
+
+- If you have access but the new payer doesn't:
+  - You'll be prompted to share the bank account from the Authorized Payer screen.
+  - The account shares immediately when you confirm.
+  - A confirmation screen appears after successful sharing.
+
+- If your own copy of the bank account is pending validation, and you try to assign a new payer who doesn’t have access:
+  - You’ll see an error prompting you to **validate your account first** by entering the test transactions before changing payers.
+
+- If **neither** you nor the new selected payer has access:
+  - You’ll be shown an error telling you to ask the current payer to share the account.
+
+This process ensures you can only set an Authorized Payer who already has bank account access or receives access during the payer change.
+
+---
+
 # FAQ
 
 ## Why share a business bank account?
@@ -80,4 +97,12 @@ If an admin already has access to the bank account, they won’t appear in the s
 
 Yes — once an admin has validated the account (if required), they can share the bank account with other admins. 
 
+## Can I share a bank account during the payer change process?
+
+Yes. If the new payer doesn’t already have access, you’ll be prompted to share the bank account before confirming the payer change. This ensures the new payer can reimburse expenses without delay.
+
+## What happens if I try to set a payer but neither of us has bank account access?
+
+You’ll be shown an error and prompted to ask the current payer to share the account with one of you before proceeding.
+
 </div>

assets/images/product-illustrations/upgrade-rocket.svg

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.3.39</string>
+	<string>9.3.40</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.3.39.3</string>
+	<string>9.3.40.1</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

contributingGuides/NAVIGATION.md

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.3.39</string>
+	<string>9.3.40</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.39.3</string>
+	<string>9.3.40.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

docs/articles/new-expensify/wallet-and-payments/Share-a-Business-Bank-Account.md

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.3.39</string>
+	<string>9.3.40</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.39.3</string>
+	<string>9.3.40.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>